firebase-tools 15.17.0 → 15.19.0

package/lib/deploy/apphosting/util.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createLocalBuildTarArchive = createLocalBuildTarArchive;
 exports.createSourceDeployArchive = createSourceDeployArchive;
+exports.resolveIgnorePatterns = resolveIgnorePatterns;
 const archiver = require("archiver");
 const fs = require("fs");
 const path = require("path");
@@ -9,25 +10,28 @@ const tar = require("tar");
 const tmp = require("tmp");
 const error_1 = require("../../error");
 const fsAsync = require("../../fsAsync");
-const config_1 = require("../../apphosting/config");
-async function createLocalBuildTarArchive(config, rootDir, targetSubDir) {
+const utils_1 = require("../../utils");
+async function createLocalBuildTarArchive(config, rootDir, outputFiles) {
     const tmpFile = tmp.fileSync({ prefix: `${config.backendId}-`, postfix: ".tar.gz" }).name;
-    const targetDir = targetSubDir ? path.join(rootDir, targetSubDir) : rootDir;
-    const ignore = ["firebase-debug.log", "firebase-debug.*.log", ".git"];
-    const rdrFiles = await fsAsync.readdirRecursive({
-        path: targetDir,
-        ignore: ignore,
-        isGitIgnore: true,
-    });
-    const allFiles = rdrFiles.map((rdrf) => path.relative(rootDir, rdrf.name));
-    if (targetSubDir) {
-        const defaultFiles = fs.readdirSync(rootDir).filter((file) => {
-            return config_1.APPHOSTING_YAML_FILE_REGEX.test(file);
-        });
-        for (const file of defaultFiles) {
-            if (!allFiles.includes(file)) {
-                allFiles.push(file);
-            }
+    const filesToPackage = outputFiles.length > 0 ? outputFiles : ["."];
+    const allFiles = [];
+    for (const fileOrDir of filesToPackage) {
+        const absolutePath = path.join(rootDir, fileOrDir);
+        if (!fs.existsSync(absolutePath)) {
+            (0, utils_1.logLabeledWarning)("apphosting", `Expected build output file or directory not found: ${fileOrDir}`);
+            continue;
+        }
+        const stat = fs.statSync(absolutePath);
+        if (stat.isDirectory()) {
+            const rdrFiles = await fsAsync.readdirRecursive({
+                path: absolutePath,
+                ignoreStrings: ["firebase-debug.log", "firebase-debug.*.log"],
+                supportGitIgnore: false,
+            });
+            allFiles.push(...rdrFiles.map((rdrf) => path.relative(rootDir, rdrf.name)));
+        }
+        else {
+            allFiles.push(path.relative(rootDir, absolutePath));
         }
     }
     try {
@@ -58,15 +62,12 @@ async function createSourceDeployArchive(config, rootDir, targetSubDir) {
     });
     const archive = archiver("zip");
     const targetDir = targetSubDir ? path.join(rootDir, targetSubDir) : rootDir;
-    const ignore = config.ignore || ["node_modules", ".git"];
-    ignore.push("firebase-debug.log", "firebase-debug.*.log");
-    const gitIgnorePatterns = parseGitIgnorePatterns(targetDir);
-    ignore.push(...gitIgnorePatterns);
+    const ignore = resolveIgnorePatterns(config);
     try {
         const files = await fsAsync.readdirRecursive({
             path: targetDir,
-            ignore: ignore,
-            isGitIgnore: true,
+            ignoreStrings: ignore,
+            supportGitIgnore: true,
         });
         for (const file of files) {
             const name = path.relative(rootDir, file.name);
@@ -78,22 +79,19 @@ async function createSourceDeployArchive(config, rootDir, targetSubDir) {
         await pipeAsync(archive, fileStream);
     }
     catch (err) {
-        throw new error_1.FirebaseError(`Could not read source directory. Remove links and shortcuts and try again. Original: ${err}`, { original: err, exit: 1 });
+        throw new error_1.FirebaseError(`Could not read source directory. Remove links and shortcuts and try again. Original: ${String(err)}`, { original: err, exit: 1 });
     }
     return tmpFile;
 }
-function parseGitIgnorePatterns(projectRoot, gitIgnorePath = ".gitignore") {
-    const absoluteFilePath = path.resolve(projectRoot, gitIgnorePath);
-    if (!fs.existsSync(absoluteFilePath)) {
-        return [];
-    }
-    const lines = fs
-        .readFileSync(absoluteFilePath)
-        .toString()
-        .split("\n")
-        .map((line) => line.trim())
-        .filter((line) => !line.startsWith("#") && !(line === ""));
-    return lines;
+function resolveIgnorePatterns(config, skipDefaultNodeModules = false) {
+    const ignore = config.ignore
+        ? [...config.ignore]
+        : skipDefaultNodeModules
+            ? [".git"]
+            : ["node_modules", ".git"];
+    ignore.push("firebase-debug.log", "firebase-debug.*.log");
+    ignore.push(".local_build_*");
+    return ignore;
 }
 async function pipeAsync(from, to) {
     from.pipe(to);

package/lib/deploy/functions/backend.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.missingEndpoint = exports.hasEndpoint = exports.AllFunctionsPlatforms = exports.SCHEDULED_FUNCTION_LABEL = exports.MIN_CPU_FOR_CONCURRENCY = exports.DEFAULT_MEMORY = exports.DEFAULT_CONCURRENCY = exports.AllIngressSettings = exports.AllVpcEgressSettings = void 0;
+exports.missingEndpoint = exports.hasEndpoint = exports.AllFunctionsPlatforms = exports.SCHEDULED_FUNCTION_LABEL = exports.MIN_CPU_FOR_CONCURRENCY = exports.DEFAULT_TIMEOUT_SECONDS = exports.DEFAULT_MEMORY = exports.DEFAULT_CONCURRENCY = exports.AllIngressSettings = exports.AllVpcEgressSettings = void 0;
 exports.endpointTriggerType = endpointTriggerType;
 exports.isValidMemoryOption = isValidMemoryOption;
 exports.isValidEgressSetting = isValidEgressSetting;
@@ -116,6 +116,7 @@ function memoryToGen2Cpu(memory) {
 }
 exports.DEFAULT_CONCURRENCY = 80;
 exports.DEFAULT_MEMORY = 256;
+exports.DEFAULT_TIMEOUT_SECONDS = 60;
 exports.MIN_CPU_FOR_CONCURRENCY = 1;
 exports.SCHEDULED_FUNCTION_LABEL = Object.freeze({ deployment: "firebase-schedule" });
 function secretVersionName(s) {

package/lib/deploy/functions/prepare.js

@@ -2,12 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DEFAULT_FUNCTION_REGION = exports.EVENTARC_SOURCE_ENV = void 0;
 exports.prepare = prepare;
-exports.matchRegionsForExisting = matchRegionsForExisting;
-exports.resolveDefaultRegions = resolveDefaultRegions;
+exports.resolveDefaultRegionsForBuild = resolveDefaultRegionsForBuild;
 exports.inferDetailsFromExisting = inferDetailsFromExisting;
 exports.updateEndpointTargetedStatus = updateEndpointTargetedStatus;
 exports.inferBlockingDetails = inferBlockingDetails;
 exports.resolveCpuAndConcurrency = resolveCpuAndConcurrency;
+exports.resolveDefaultTimeout = resolveDefaultTimeout;
 exports.loadCodebases = loadCodebases;
 exports.warnIfNewGenkitFunctionIsMissingSecrets = warnIfNewGenkitFunctionIsMissingSecrets;
 exports.ensureAllRequiredAPIsEnabled = ensureAllRequiredAPIsEnabled;
@@ -78,6 +78,7 @@ async function prepare(context, options, payload) {
     }
     context.hasRuntimeConfig = Object.keys(runtimeConfig).some((k) => k !== "firebase");
     const wantBuilds = await loadCodebases(context.config, options, firebaseConfig, runtimeConfig, context.filters);
+    const existingBackend = await backend.existingBackend(context);
     if (Object.values(wantBuilds).some((b) => b.extensions)) {
         const extContext = {};
         const extPayload = {};
@@ -99,6 +100,10 @@ async function prepare(context, options, payload) {
         proto.convertIfPresent(userEnvOpt, localCfg, "configDir", (cd) => options.config.path(cd));
         const userEnvs = functionsEnv.loadUserEnvs(userEnvOpt);
         const envs = { ...userEnvs, ...firebaseEnvs };
+        const relevantEndpoints = backend
+            .allEndpoints(existingBackend)
+            .filter((e) => e.codebase === codebase || e.codebase === undefined);
+        await resolveDefaultRegionsForBuild(wantBuild, backend.of(...relevantEndpoints));
         const { backend: wantBackend, envs: resolvedEnvs } = await build.resolveBackend({
             build: wantBuild,
             firebaseConfig,
@@ -194,13 +199,6 @@ async function prepare(context, options, payload) {
         context.sources[codebase] = source;
     }
     payload.functions = {};
-    const existingBackend = await backend.existingBackend(context);
-    for (const [codebase, wantBackend] of Object.entries(wantBackends)) {
-        const relevantEndpoints = backend
-            .allEndpoints(existingBackend)
-            .filter((e) => e.codebase === codebase || e.codebase === undefined);
-        await resolveDefaultRegions(wantBackend, backend.of(...relevantEndpoints));
-    }
     const haveBackends = (0, functionsDeployHelper_1.groupEndpointsByCodebase)(wantBackends, backend.allEndpoints(existingBackend));
     for (const [codebase, wantBackend] of Object.entries(wantBackends)) {
         const haveBackend = haveBackends[codebase] || backend.empty();
@@ -210,6 +208,7 @@ async function prepare(context, options, payload) {
         inferDetailsFromExisting(wantBackend, haveBackend, codebaseUsesEnvs.includes(codebase));
         await (0, triggerRegionHelper_1.ensureTriggerRegions)(wantBackend);
         resolveCpuAndConcurrency(wantBackend);
+        resolveDefaultTimeout(wantBackend);
         validate.endpointsAreValid(wantBackend);
         inferBlockingDetails(wantBackend);
     }
@@ -232,66 +231,50 @@ async function prepare(context, options, payload) {
     validate.checkFiltersIntegrity(wantBackends, context.filters);
     (0, applyHash_1.applyBackendHashToBackends)(wantBackends, context);
 }
-function moveEndpointToRegion(backend, endpoint, region) {
-    endpoint.region = region;
-    backend.endpoints[region] = backend.endpoints[region] || {};
-    backend.endpoints[region][endpoint.id] = endpoint;
-    delete backend.endpoints[build.REGION_TBD][endpoint.id];
-    if (Object.keys(backend.endpoints[build.REGION_TBD]).length === 0) {
-        delete backend.endpoints[build.REGION_TBD];
-    }
-}
-function matchRegionsForExisting(want, have) {
-    for (const [id, wantE] of Object.entries(want.endpoints[build.REGION_TBD] || {})) {
-        let matching;
-        for (const region of Object.keys(have.endpoints)) {
-            if (region === build.REGION_TBD) {
-                continue;
-            }
-            if (have.endpoints[region][id]) {
-                if (matching) {
-                    throw new error_1.FirebaseError(`Cannot resolve default region for function ${id}. It exists in multiple regions. The region must be specified to continue.`);
+async function resolveDefaultRegionsForBuild(buildObj, have) {
+    for (const [id, endpoint] of Object.entries(buildObj.endpoints)) {
+        if (!endpoint.region?.length || endpoint.region.includes(build.REGION_TBD)) {
+            let resolvedRegion = exports.DEFAULT_FUNCTION_REGION;
+            let matching;
+            for (const region of Object.keys(have.endpoints)) {
+                if (have.endpoints[region][id]) {
+                    if (matching) {
+                        throw new error_1.FirebaseError(`Cannot resolve default region for function ${id}. It exists in multiple regions. The region must be specified to continue.`);
+                    }
+                    matching = have.endpoints[region][id];
                 }
-                matching = have.endpoints[region][id];
             }
-        }
-        if (!matching) {
-            continue;
-        }
-        moveEndpointToRegion(want, wantE, matching.region);
-    }
-}
-async function resolveDefaultRegions(want, have) {
-    matchRegionsForExisting(want, have);
-    const endpoints = Object.values(want.endpoints[build.REGION_TBD] || {});
-    for (const endpoint of endpoints) {
-        let resolvedRegion = "us-central1";
-        try {
-            if (backend.isBlockingTriggered(endpoint)) {
-                resolvedRegion = resolveRegionForBlockingTrigger(endpoint);
+            if (matching) {
+                resolvedRegion = matching.region;
             }
-            else if (backend.isEventTriggered(endpoint)) {
-                resolvedRegion = await resolveRegionForEventTrigger(endpoint);
+            else {
+                try {
+                    if (build.isBlockingTriggered(endpoint)) {
+                        resolvedRegion = resolveRegionForBlockingTrigger(endpoint.blockingTrigger);
+                    }
+                    else if (build.isEventTriggered(endpoint)) {
+                        resolvedRegion = await resolveRegionForEventTrigger(endpoint.project, endpoint.eventTrigger);
+                    }
+                }
+                catch (err) {
+                    logger_1.logger.debug(`Failed to resolve region for endpoint ${id}. Defaulting to ${exports.DEFAULT_FUNCTION_REGION}.`, (0, error_1.getErrStack)(err));
+                }
             }
+            endpoint.region = [resolvedRegion];
         }
-        catch (err) {
-            logger_1.logger.debug(`Failed to resolve region for endpoint ${endpoint.id}. Defaulting to us-central1.`, (0, error_1.getErrStack)(err));
-        }
-        moveEndpointToRegion(want, endpoint, resolvedRegion);
     }
 }
-function resolveRegionForBlockingTrigger(endpoint) {
-    const eventType = endpoint.blockingTrigger.eventType;
+function resolveRegionForBlockingTrigger(blockingTrigger) {
+    const eventType = blockingTrigger.eventType;
     if (events.AUTH_BLOCKING_EVENTS.includes(eventType)) {
         return "us-east1";
     }
-    if ((0, ailogic_1.isGlobalAILogicEndpoint)(endpoint)) {
+    if ((0, ailogic_1.isGlobalAILogicTrigger)(blockingTrigger)) {
         return "us-east1";
     }
     return exports.DEFAULT_FUNCTION_REGION;
 }
-async function resolveRegionForEventTrigger(endpoint) {
-    const eventTrigger = endpoint.eventTrigger;
+async function resolveRegionForEventTrigger(project, eventTrigger) {
     const eventType = eventTrigger.eventType;
     if (eventType.startsWith("google.cloud.pubsub.") ||
         eventType.startsWith("providers/cloud.auth/eventTypes/") ||
@@ -304,7 +287,7 @@ async function resolveRegionForEventTrigger(endpoint) {
     if (eventType.startsWith("google.cloud.firestore.")) {
         try {
             const databaseId = eventTrigger.eventFilters?.database || "(default)";
-            const db = await (0, firestore_1.getDatabase)(endpoint.project, databaseId);
+            const db = await (0, firestore_1.getDatabase)(project, databaseId);
             const locationId = db.locationId.toLowerCase();
             if (locationId === "nam5" || locationId === "nam7")
                 return "us-central1";
@@ -341,7 +324,7 @@ async function resolveRegionForEventTrigger(endpoint) {
         try {
             const instanceName = eventTrigger.eventFilters?.instance;
             if (instanceName) {
-                const details = await (0, database_1.getDatabaseInstanceDetails)(endpoint.project, instanceName);
+                const details = await (0, database_1.getDatabaseInstanceDetails)(project, instanceName);
                 if (details.location && details.location !== "-") {
                     return details.location.toLowerCase();
                 }
@@ -389,6 +372,9 @@ function inferDetailsFromExisting(want, have, usedDotenv) {
         if (typeof wantE.cpu === "undefined" && haveE.cpu) {
             wantE.cpu = haveE.cpu;
         }
+        if (typeof wantE.timeoutSeconds === "undefined" && haveE.timeoutSeconds) {
+            wantE.timeoutSeconds = haveE.timeoutSeconds;
+        }
         wantE.securityLevel = haveE.securityLevel ? haveE.securityLevel : "SECURE_ALWAYS";
         maybeCopyTriggerRegion(wantE, haveE);
     }
@@ -454,6 +440,13 @@ function resolveCpuAndConcurrency(want) {
         }
     }
 }
+function resolveDefaultTimeout(want) {
+    for (const e of backend.allEndpoints(want)) {
+        if (e.platform === "run" && e.timeoutSeconds === undefined) {
+            e.timeoutSeconds = backend.DEFAULT_TIMEOUT_SECONDS;
+        }
+    }
+}
 async function loadCodebases(config, options, firebaseConfig, runtimeConfig, filters) {
     const codebases = (0, functionsDeployHelper_1.targetCodebases)(config, filters);
     const projectId = (0, projectUtils_1.needProjectId)(options);

package/lib/deploy/functions/prepareFunctionsUpload.js

@@ -78,7 +78,7 @@ async function packageSource(projectDir, sourceDir, config, additionalSources, r
     const ignore = config.ignore || ["node_modules", ".git"];
     ignore.push("firebase-debug.log", "firebase-debug.*.log", CONFIG_DEST_FILE);
     try {
-        const files = await fsAsync.readdirRecursive({ path: sourceDir, ignore: ignore });
+        const files = await fsAsync.readdirRecursive({ path: sourceDir, ignoreStrings: ignore });
         hashes.push(...(await addFilesToArchive(archive, files, sourceDir, options?.executablePaths)));
         for (const name of additionalSources) {
             const absPath = utils.resolveWithin(projectDir, name);

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

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AILogicService = exports.AI_LOGIC_EVENTS = exports.AI_LOGIC_AFTER_GENERATE_CONTENT = exports.AI_LOGIC_BEFORE_GENERATE_CONTENT = void 0;
 exports.isAILogicEvent = isAILogicEvent;
-exports.isGlobalAILogicEndpoint = isGlobalAILogicEndpoint;
+exports.isGlobalAILogicTrigger = isGlobalAILogicTrigger;
 const backend = require("../backend");
 const error_1 = require("../../../error");
 const ailogicApi = require("../../../gcp/ailogic");
@@ -20,11 +20,9 @@ function isAILogicEvent(endpoint) {
     }
     return exports.AI_LOGIC_EVENTS.includes(endpoint.blockingTrigger.eventType);
 }
-function isGlobalAILogicEndpoint(endpoint) {
-    if (!isAILogicEvent(endpoint)) {
-        return false;
-    }
-    return !endpoint.blockingTrigger.options?.regionalWebhook;
+function isGlobalAILogicTrigger(blockingTrigger) {
+    return (exports.AI_LOGIC_EVENTS.includes(blockingTrigger.eventType) &&
+        !blockingTrigger.options?.regionalWebhook);
 }
 class AILogicService {
     constructor() {
@@ -32,6 +30,16 @@ class AILogicService {
         this.name = "ailogic";
         this.api = "firebasevertexai.googleapis.com";
     }
+    async requiredProjectBindings(projectNumber) {
+        return [
+            {
+                role: "roles/run.invoker",
+                members: [
+                    `serviceAccount:service-${projectNumber}@gcp-sa-firebasevertexai.iam.gserviceaccount.com`,
+                ],
+            },
+        ];
+    }
     validateTrigger(endpoint, wantBackend) {
         if (!isAILogicEvent(endpoint)) {
             return;

package/lib/deploy/functions/validate.js

@@ -221,7 +221,7 @@ async function secretsAreValid(projectId, wantBackend) {
     validatePlatformTargets(endpoints);
     await validateSecretVersions(projectId, endpoints);
 }
-const secretsSupportedPlatforms = ["gcfv1", "gcfv2"];
+const secretsSupportedPlatforms = backend.AllFunctionsPlatforms;
 function validatePlatformTargets(endpoints) {
     const unsupported = endpoints.filter((e) => !secretsSupportedPlatforms.includes(e.platform));
     if (unsupported.length > 0) {

package/lib/downloadUtils.js

@@ -1,7 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.downloadToTmp = downloadToTmp;
+exports.validateSize = validateSize;
+exports.validateChecksum = validateChecksum;
 const url_1 = require("url");
+const crypto = require("crypto");
 const fs = require("fs-extra");
 const ProgressBar = require("progress");
 const tmp = require("tmp");
@@ -37,3 +40,24 @@ async function downloadToTmp(remoteUrl, auth = false) {
     });
     return tmpfile.name;
 }
+function validateSize(filepath, expectedSize) {
+    return new Promise((resolve, reject) => {
+        const stat = fs.statSync(filepath);
+        return stat.size === expectedSize
+            ? resolve()
+            : reject(new error_1.FirebaseError(`download failed, expected ${expectedSize} bytes but got ${stat.size}`, { exit: 1 }));
+    });
+}
+function validateChecksum(filepath, expectedChecksum, algorithm = "md5") {
+    return new Promise((resolve, reject) => {
+        const hash = crypto.createHash(algorithm);
+        const stream = fs.createReadStream(filepath);
+        stream.on("data", (data) => hash.update(data));
+        stream.on("end", () => {
+            const checksum = hash.digest("hex");
+            return checksum === expectedChecksum
+                ? resolve()
+                : reject(new error_1.FirebaseError(`download failed, expected checksum ${expectedChecksum} but got ${checksum}`, { exit: 1 }));
+        });
+    });
+}

package/lib/emulator/download.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.downloadEmulator = downloadEmulator;
 exports.downloadExtensionVersion = downloadExtensionVersion;
-const crypto = require("crypto");
 const fs = require("fs-extra");
 const path = require("path");
 const tmp = require("tmp");
@@ -36,8 +35,8 @@ async function downloadEmulator(name) {
         throw err;
     }
     if (!emulator.opts.skipChecksumAndSize) {
-        await validateSize(tmpfile, emulator.opts.expectedSize);
-        await validateChecksum(tmpfile, emulator.opts.expectedChecksum);
+        await downloadUtils.validateSize(tmpfile, emulator.opts.expectedSize);
+        await downloadUtils.validateChecksum(tmpfile, emulator.opts.expectedChecksum, "md5");
     }
     if (emulator.opts.skipCache) {
         removeOldFiles(name, emulator, true);
@@ -82,24 +81,3 @@ function removeOldFiles(name, emulator, removeAllVersions = false) {
         }
     }
 }
-function validateSize(filepath, expectedSize) {
-    return new Promise((resolve, reject) => {
-        const stat = fs.statSync(filepath);
-        return stat.size === expectedSize
-            ? resolve()
-            : reject(new error_1.FirebaseError(`download failed, expected ${expectedSize} bytes but got ${stat.size}`, { exit: 1 }));
-    });
-}
-function validateChecksum(filepath, expectedChecksum) {
-    return new Promise((resolve, reject) => {
-        const hash = crypto.createHash("md5");
-        const stream = fs.createReadStream(filepath);
-        stream.on("data", (data) => hash.update(data));
-        stream.on("end", () => {
-            const checksum = hash.digest("hex");
-            return checksum === expectedChecksum
-                ? resolve()
-                : reject(new error_1.FirebaseError(`download failed, expected checksum ${expectedChecksum} but got ${checksum}`, { exit: 1 }));
-        });
-    });
-}

package/lib/emulator/downloadableEmulatorInfo.json

@@ -44,46 +44,46 @@
         }
     },
     "pubsub": {
-        "version": "0.8.30",
-        "expectedSize": 52917173,
-        "expectedChecksum": "f7935320d11894d0c4cd26dd064ee42f",
-        "expectedChecksumSHA256": "aabf028a55ec3f06fe2223471dad26623be542848abebd7563f8f0b8697dd2a3",
-        "remoteUrl": "https://storage.googleapis.com/firebase-preview-drop/emulator/pubsub-emulator-0.8.30.zip",
-        "downloadPathRelativeToCacheDir": "pubsub-emulator-0.8.30.zip",
-        "binaryPathRelativeToCacheDir": "pubsub-emulator-0.8.30/pubsub-emulator/bin/cloud-pubsub-emulator"
+        "version": "0.8.32",
+        "expectedSize": 52942305,
+        "expectedChecksum": "b47a3698985bff5f6aedec04fad9354e",
+        "expectedChecksumSHA256": "476d6492718210837f13e64b5b9f54335469381827bad25eda62e36572e47a82",
+        "remoteUrl": "https://storage.googleapis.com/firebase-preview-drop/emulator/pubsub-emulator-0.8.32.zip",
+        "downloadPathRelativeToCacheDir": "pubsub-emulator-0.8.32.zip",
+        "binaryPathRelativeToCacheDir": "pubsub-emulator-0.8.32/pubsub-emulator/bin/cloud-pubsub-emulator"
     },
     "dataconnect": {
         "darwin": {
-            "version": "3.4.7",
-            "expectedSize": 32361408,
-            "expectedChecksum": "b756c557573420a54da92e9d66934355",
-            "expectedChecksumSHA256": "d97bbc39e6c9960d233db975c3f2e66d43c2a34436f8e39fae3cbe2a815e2c6b",
-            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-macos-amd64-v3.4.7",
-            "downloadPathRelativeToCacheDir": "dataconnect-emulator-3.4.7"
+            "version": "3.4.9",
+            "expectedSize": 32423488,
+            "expectedChecksum": "75788cfdb69c2762ac9f78e37714d364",
+            "expectedChecksumSHA256": "af26c22a6fe131b111b4e71eb4c179b2b42a9cf8d334d50e4c2c419bbbb54416",
+            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-macos-amd64-v3.4.9",
+            "downloadPathRelativeToCacheDir": "dataconnect-emulator-3.4.9"
         },
         "darwin_arm64": {
-            "version": "3.4.7",
-            "expectedSize": 30504610,
-            "expectedChecksum": "f3015d7cfd03bd4fcb7d76d6aac29c84",
-            "expectedChecksumSHA256": "3b0d4d273dabd04dc01ef57001180ed6daae2f1781d25f1f01eb6da5d25d5ae5",
-            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-macos-arm64-v3.4.7",
-            "downloadPathRelativeToCacheDir": "dataconnect-emulator-3.4.7"
+            "version": "3.4.9",
+            "expectedSize": 30554802,
+            "expectedChecksum": "7e64aba6ffc071ef60b8f2a51b3f5683",
+            "expectedChecksumSHA256": "49ba258954b3568e93ef75b4c7e9a50c708a7e15ba9a22697ff967e195a907aa",
+            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-macos-arm64-v3.4.9",
+            "downloadPathRelativeToCacheDir": "dataconnect-emulator-3.4.9"
         },
         "win32": {
-            "version": "3.4.7",
-            "expectedSize": 32403456,
-            "expectedChecksum": "7fac83eee96f4f638d84a9c3a6950040",
-            "expectedChecksumSHA256": "42a88d0377565a94b966336d45b45a8ec24c6a81b0206654327d7722107569de",
-            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-windows-amd64-v3.4.7",
-            "downloadPathRelativeToCacheDir": "dataconnect-emulator-3.4.7.exe"
+            "version": "3.4.9",
+            "expectedSize": 32464896,
+            "expectedChecksum": "1bc40de5be6bab9280904ee68f849594",
+            "expectedChecksumSHA256": "b0b277ed1efd374099b90a74ebb2994ffa5755c185d8d9d2cf667f49c0c31139",
+            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-windows-amd64-v3.4.9",
+            "downloadPathRelativeToCacheDir": "dataconnect-emulator-3.4.9.exe"
         },
         "linux": {
-            "version": "3.4.7",
-            "expectedSize": 31518904,
-            "expectedChecksum": "2aa615b65f12a9efd768e13ab92bf457",
-            "expectedChecksumSHA256": "7ce36de105950172ee6f41100df93c92ba2cd2b2f89cb157740fc1ae808fcebb",
-            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-linux-amd64-v3.4.7",
-            "downloadPathRelativeToCacheDir": "dataconnect-emulator-3.4.7"
+            "version": "3.4.9",
+            "expectedSize": 31580344,
+            "expectedChecksum": "4de2d7d37652d652d059335a43dc02b4",
+            "expectedChecksumSHA256": "803ec59b5ec1590ed4521df70864a46808f3ec8008756206bf210852e2298291",
+            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-linux-amd64-v3.4.9",
+            "downloadPathRelativeToCacheDir": "dataconnect-emulator-3.4.9"
         }
     }
 }

package/lib/fsAsync.js

@@ -6,12 +6,37 @@ const ignore_1 = require("ignore");
 const _ = require("lodash");
 const minimatch = require("minimatch");
 const path_1 = require("path");
+const logger_1 = require("./logger");
 async function readdirRecursiveHelper(options) {
     const dirContents = (0, fs_extra_1.readdirSync)(options.path, { withFileTypes: true });
+    let currentGitIgnoreStack = options.gitIgnoreStack || [];
+    if (options.supportGitIgnore) {
+        if (dirContents.find((n) => n.name === ".gitignore")?.isFile()) {
+            const localGitIgnore = (0, path_1.join)(options.path, ".gitignore");
+            try {
+                const lines = (0, fs_extra_1.readFileSync)(localGitIgnore)
+                    .toString()
+                    .split("\n")
+                    .map((line) => line.trim())
+                    .filter((line) => !line.startsWith("#") && line !== "");
+                const subIgnore = (0, ignore_1.default)().add(lines);
+                currentGitIgnoreStack = [
+                    ...currentGitIgnoreStack,
+                    {
+                        dirPath: options.path,
+                        ignore: subIgnore,
+                    },
+                ];
+            }
+            catch (e) {
+                logger_1.logger.debug(`Error reading .gitignore file at ${localGitIgnore}:`, e);
+            }
+        }
+    }
     const fullPaths = dirContents
         .filter((n) => !options.ignoreSymlinks || !n.isSymbolicLink())
         .map((n) => (0, path_1.join)(options.path, n.name));
-    const filteredPaths = fullPaths.filter((p) => !options.filter(p));
+    const filteredPaths = fullPaths.filter((p) => !options.filter(p, currentGitIgnoreStack));
     const filePromises = [];
     for (const p of filteredPaths) {
         const fstat = (0, fs_extra_1.statSync)(p);
@@ -27,6 +52,8 @@ async function readdirRecursiveHelper(options) {
                 filter: options.filter,
                 maxDepth: options.maxDepth - 1,
                 ignoreSymlinks: options.ignoreSymlinks,
+                supportGitIgnore: options.supportGitIgnore,
+                gitIgnoreStack: currentGitIgnoreStack,
             }));
         }
     }
@@ -37,25 +64,41 @@ async function readdirRecursiveHelper(options) {
 }
 async function readdirRecursive(options) {
     const mmopts = { matchBase: true, dot: true };
-    const rules = (options.ignore || []).map((glob) => {
+    const ignoreRules = (options.ignoreStrings || []).map((glob) => {
         return (p) => minimatch(p, glob, mmopts);
     });
-    const gitIgnoreRules = (0, ignore_1.default)()
-        .add(options.ignore || [])
-        .createFilter();
-    const filter = (t) => {
-        if (options.isGitIgnore) {
-            return !gitIgnoreRules((0, path_1.relative)(options.path, t));
+    const filter = (targetPath, gitIgnoreStack = []) => {
+        if (options.supportGitIgnore) {
+            let ignored = false;
+            for (let i = gitIgnoreStack.length - 1; i >= 0; i--) {
+                const state = gitIgnoreStack[i];
+                const relPath = (0, path_1.relative)(state.dirPath, targetPath);
+                const result = state.ignore.test(relPath);
+                if (result.ignored || result.unignored) {
+                    ignored = result.ignored;
+                    break;
+                }
+            }
+            return ignored;
         }
-        return rules.some((rule) => {
-            return rule(t);
+        return ignoreRules.some((rule) => {
+            return rule(targetPath);
         });
     };
+    const initialGitIgnoreStack = [];
+    if (options.supportGitIgnore) {
+        initialGitIgnoreStack.push({
+            dirPath: options.path,
+            ignore: (0, ignore_1.default)().add(options.ignoreStrings || []),
+        });
+    }
     const maxDepth = options.maxDepth && options.maxDepth > 0 ? options.maxDepth : Infinity;
     return await readdirRecursiveHelper({
         path: options.path,
         filter: filter,
         maxDepth,
         ignoreSymlinks: !!options.ignoreSymlinks,
+        supportGitIgnore: options.supportGitIgnore,
+        gitIgnoreStack: initialGitIgnoreStack,
     });
 }