firebase-tools 11.4.0 → 11.5.0

package/lib/deploy/hosting/deploy.js

@@ -7,24 +7,21 @@ const listFiles_1 = require("../../listFiles");
 const logger_1 = require("../../logger");
 const track_1 = require("../../track");
 const utils_1 = require("../../utils");
-const clc = require("cli-color");
-const SPINNER = ["⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏"];
-const _ERASE_LINE = "\x1b[2K";
+const colorette_1 = require("colorette");
+const ora = require("ora");
 async function deploy(context, options) {
     var _a, _b;
     if (!((_a = context.hosting) === null || _a === void 0 ? void 0 : _a.deploys)) {
         return;
     }
-    let spins = 0;
+    const spinner = ora();
     function updateSpinner(newMessage, debugging) {
         if (debugging) {
             (0, utils_1.logLabeledBullet)("hosting", newMessage);
         }
         else {
-            process.stdout.write(_ERASE_LINE + clc.move(-9999, 0));
-            process.stdout.write(clc.bold.cyan(SPINNER[spins % SPINNER.length] + "  hosting: ") + newMessage);
+            spinner.text = `${(0, colorette_1.bold)((0, colorette_1.cyan)(" hosting:"))} ${newMessage}`;
         }
-        spins++;
     }
     async function runDeploys(deploys, debugging) {
         var _a;
@@ -36,11 +33,11 @@ async function deploy(context, options) {
             (0, utils_1.logLabeledBullet)(`hosting[${deploy.site}]`, 'no "public" directory to upload, continuing with release');
             return runDeploys(deploys, debugging);
         }
-        (0, utils_1.logLabeledBullet)("hosting[" + deploy.site + "]", "beginning deploy...");
+        (0, utils_1.logLabeledBullet)(`hosting[${deploy.site}]`, "beginning deploy...");
         const t0 = Date.now();
         const publicDir = options.config.path(deploy.config.public);
         const files = (0, listFiles_1.listFiles)(publicDir, deploy.config.ignore);
-        (0, utils_1.logLabeledBullet)(`hosting[${deploy.site}]`, `found ${files.length} files in ${clc.bold(deploy.config.public)}`);
+        (0, utils_1.logLabeledBullet)(`hosting[${deploy.site}]`, `found ${files.length} files in ${(0, colorette_1.bold)(deploy.config.public)}`);
         let concurrency = 200;
         const envConcurrency = (0, utils_1.envOverride)("FIREBASE_HOSTING_UPLOAD_CONCURRENCY", "");
         if (envConcurrency) {
@@ -59,6 +56,9 @@ async function deploy(context, options) {
             uploadConcurrency: concurrency,
         });
         const progressInterval = setInterval(() => updateSpinner(uploader.statusMessage(), debugging), debugging ? 2000 : 200);
+        if (!debugging) {
+            spinner.start();
+        }
         try {
             await uploader.start();
         }
@@ -68,9 +68,10 @@ async function deploy(context, options) {
         }
         finally {
             clearInterval(progressInterval);
+            updateSpinner(uploader.statusMessage(), debugging);
         }
         if (!debugging) {
-            process.stdout.write(_ERASE_LINE + clc.move(-9999, 0));
+            spinner.stop();
         }
         (0, utils_1.logLabeledSuccess)("hosting[" + deploy.site + "]", "file upload complete");
         const dt = Date.now() - t0;

package/lib/deploy/hosting/uploader.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Uploader = void 0;
 const lodash_1 = require("lodash");
 const abort_controller_1 = require("abort-controller");
-const clc = require("cli-color");
+const clc = require("colorette");
 const crypto = require("crypto");
 const fs = require("fs");
 const path = require("path");
@@ -19,7 +19,7 @@ const MAX_UPLOAD_TIMEOUT = 7200000;
 function progressMessage(message, current, total) {
     current = Math.min(current, total);
     const percent = Math.floor(((current * 1.0) / total) * 100).toString();
-    return `${message} [${current}/${total}] (${clc.bold.green(`${percent}%`)})`;
+    return `${message} [${current}/${total}] (${clc.bold(clc.green(`${percent}%`))})`;
 }
 class Uploader {
     constructor(options) {

package/lib/deploy/hosting/validate.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateDeploy = void 0;
 const path = require("path");
-const clc = require("cli-color");
+const clc = require("colorette");
 const error_1 = require("../../error");
 const projectPath_1 = require("../../projectPath");
 const fsutils_1 = require("../../fsutils");
@@ -33,7 +33,7 @@ function validateDeploy(deploy, options) {
         else {
             const i18nPath = path.join(cfg.public, cfg.i18n.root);
             if (!(0, fsutils_1.dirExistsSync)((0, projectPath_1.resolveProjectPath)(options, i18nPath))) {
-                (0, utils_1.logLabeledWarning)("hosting", `Couldn't find specified i18n root directory ${clc.bold(cfg.i18n.root)} in public directory ${clc.bold(cfg.public)}.`);
+                (0, utils_1.logLabeledWarning)("hosting", `Couldn't find specified i18n root directory ${clc.bold(cfg.i18n.root)} in public directory ${clc.bold(cfg.public || "")}.`);
             }
         }
     }

package/lib/deploy/index.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.deploy = void 0;
 const logger_1 = require("../logger");
 const api_1 = require("../api");
-const cli_color_1 = require("cli-color");
+const colorette_1 = require("colorette");
 const lodash_1 = require("lodash");
 const projectUtils_1 = require("../projectUtils");
 const utils_1 = require("../utils");
@@ -52,7 +52,7 @@ const deploy = async function (targetNames, options, customContext = {}) {
     for (const targetName of targetNames) {
         const target = TARGETS[targetName];
         if (!target) {
-            return Promise.reject(new error_1.FirebaseError(`${(0, cli_color_1.bold)(targetName)} is not a valid deploy target`));
+            return Promise.reject(new error_1.FirebaseError(`${(0, colorette_1.bold)(targetName)} is not a valid deploy target`));
         }
         predeploys.push((0, lifecycleHooks_1.lifecycleHooks)(targetName, "predeploy"));
         prepares.push(target.prepare);
@@ -61,9 +61,9 @@ const deploy = async function (targetNames, options, customContext = {}) {
         postdeploys.push((0, lifecycleHooks_1.lifecycleHooks)(targetName, "postdeploy"));
     }
     logger_1.logger.info();
-    logger_1.logger.info((0, cli_color_1.bold)((0, cli_color_1.white)("===") + " Deploying to '" + projectId + "'..."));
+    logger_1.logger.info((0, colorette_1.bold)((0, colorette_1.white)("===") + " Deploying to '" + projectId + "'..."));
     logger_1.logger.info();
-    (0, utils_1.logBullet)("deploying " + (0, cli_color_1.bold)(targetNames.join(", ")));
+    (0, utils_1.logBullet)("deploying " + (0, colorette_1.bold)(targetNames.join(", ")));
     await chain(predeploys, context, options, payload);
     await chain(prepares, context, options, payload);
     await chain(deploys, context, options, payload);
@@ -75,13 +75,13 @@ const deploy = async function (targetNames, options, customContext = {}) {
     const duration = Date.now() - startTime;
     await (0, track_1.track)("Product Deploy", [...targetNames].sort().join(","), duration);
     logger_1.logger.info();
-    (0, utils_1.logSuccess)(cli_color_1.bold.underline("Deploy complete!"));
+    (0, utils_1.logSuccess)((0, colorette_1.bold)((0, colorette_1.underline)("Deploy complete!")));
     logger_1.logger.info();
     const deployedHosting = (0, lodash_1.includes)(targetNames, "hosting");
-    logger_1.logger.info((0, cli_color_1.bold)("Project Console:"), (0, utils_1.consoleUrl)(options.project, "/overview"));
+    logger_1.logger.info((0, colorette_1.bold)("Project Console:"), (0, utils_1.consoleUrl)(options.project, "/overview"));
     if (deployedHosting) {
         (0, lodash_1.each)(context.hosting.deploys, (deploy) => {
-            logger_1.logger.info((0, cli_color_1.bold)("Hosting URL:"), (0, utils_1.addSubdomain)(api_1.hostingOrigin, deploy.site));
+            logger_1.logger.info((0, colorette_1.bold)("Hosting URL:"), (0, utils_1.addSubdomain)(api_1.hostingOrigin, deploy.site));
         });
         const versionNames = context.hosting.deploys.map((deploy) => deploy.version);
         return { hosting: versionNames.length === 1 ? versionNames[0] : versionNames };

package/lib/deploy/lifecycleHooks.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.lifecycleHooks = void 0;
 const utils = require("../utils");
-const clc = require("cli-color");
+const clc = require("colorette");
 const childProcess = require("child_process");
 const error_1 = require("../error");
 const needProjectId = require("../projectUtils").needProjectId;
@@ -82,7 +82,10 @@ function runTargetCommands(target, hook, overallOptions, config) {
     }
     return runAllCommands
         .then(() => {
-        utils.logSuccess(clc.green.bold(logIdentifier + ":") + " Finished running " + clc.bold(hook) + " script.");
+        utils.logSuccess(clc.green(clc.bold(logIdentifier + ":")) +
+            " Finished running " +
+            clc.bold(hook) +
+            " script.");
     })
         .catch((err) => {
         throw new error_1.FirebaseError(logIdentifier + " " + hook + " error: " + err.message);

package/lib/deploy/storage/prepare.js

@@ -24,13 +24,11 @@ async function default_1(context, options) {
             }
         }
     }
-    _.set(context, "storage.rules", rulesConfig);
     const rulesDeploy = new rulesDeploy_1.RulesDeploy(options, rulesDeploy_1.RulesetServiceType.FIREBASE_STORAGE);
-    _.set(context, "storage.rulesDeploy", rulesDeploy);
+    const rulesConfigsToDeploy = [];
     if (!Array.isArray(rulesConfig)) {
         const defaultBucket = await gcp.storage.getDefaultBucket(options.project);
         rulesConfig = [Object.assign(rulesConfig, { bucket: defaultBucket })];
-        _.set(context, "storage.rules", rulesConfig);
     }
     for (const ruleConfig of rulesConfig) {
         const target = ruleConfig.target;
@@ -39,12 +37,16 @@ async function default_1(context, options) {
         }
         if (allStorage || onlyTargets.has(target)) {
             rulesDeploy.addFile(ruleConfig.rules);
+            rulesConfigsToDeploy.push(ruleConfig);
             onlyTargets.delete(target);
         }
     }
     if (!allStorage && onlyTargets.size !== 0) {
         throw new error_1.FirebaseError(`Could not find rules for the following storage targets: ${[...onlyTargets].join(", ")}`);
     }
+    _.set(context, "storage.rules", rulesConfig);
+    _.set(context, "storage.rulesConfigsToDeploy", rulesConfigsToDeploy);
+    _.set(context, "storage.rulesDeploy", rulesDeploy);
     await rulesDeploy.compile();
 }
 exports.default = default_1;

package/lib/deploy/storage/release.js

@@ -3,13 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const lodash_1 = require("lodash");
 const rulesDeploy_1 = require("../../rulesDeploy");
 async function default_1(context, options) {
-    const rules = (0, lodash_1.get)(context, "storage.rules", []);
+    const rulesConfigsToDeploy = (0, lodash_1.get)(context, "storage.rulesConfigsToDeploy", []);
     const rulesDeploy = (0, lodash_1.get)(context, "storage.rulesDeploy");
-    if (!rules.length || !rulesDeploy) {
-        return;
+    if (!rulesConfigsToDeploy.length || !rulesDeploy) {
+        return [];
     }
     const toRelease = [];
-    for (const ruleConfig of rules) {
+    for (const ruleConfig of rulesConfigsToDeploy) {
         if (ruleConfig.target) {
             options.rc.target(options.project, "storage", ruleConfig.target).forEach((bucket) => {
                 toRelease.push({ bucket: bucket, rules: ruleConfig.rules });
@@ -19,8 +19,9 @@ async function default_1(context, options) {
             toRelease.push({ bucket: ruleConfig.bucket, rules: ruleConfig.rules });
         }
     }
-    await Promise.all(toRelease.map((release) => {
-        return rulesDeploy.release(release.rules, rulesDeploy_1.RulesetServiceType.FIREBASE_STORAGE, release.bucket);
+    await Promise.all(toRelease.map((r) => {
+        return rulesDeploy.release(r.rules, rulesDeploy_1.RulesetServiceType.FIREBASE_STORAGE, r.bucket);
     }));
+    return toRelease.map((r) => r.bucket);
 }
 exports.default = default_1;

package/lib/emulator/commandUtils.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.JAVA_DEPRECATION_WARNING = exports.checkJavaSupported = exports.emulatorExec = exports.shutdownWhenKilled = exports.setExportOnExitOptions = exports.parseInspectionPort = exports.beforeEmulatorCommand = exports.warnEmulatorNotSupported = exports.printNoticeIfEmulated = exports.DESC_TEST_PARAMS = exports.FLAG_TEST_PARAMS = exports.DESC_TEST_CONFIG = exports.FLAG_TEST_CONFIG = exports.DESC_UI = exports.FLAG_UI = exports.EXPORT_ON_EXIT_CWD_DANGER = exports.EXPORT_ON_EXIT_USAGE_ERROR = exports.DESC_EXPORT_ON_EXIT = exports.FLAG_EXPORT_ON_EXIT = exports.FLAG_EXPORT_ON_EXIT_NAME = exports.DESC_IMPORT = exports.FLAG_IMPORT = exports.DESC_INSPECT_FUNCTIONS = exports.FLAG_INSPECT_FUNCTIONS = exports.DESC_ONLY = exports.FLAG_ONLY = void 0;
-const clc = require("cli-color");
+const clc = require("colorette");
 const childProcess = require("child_process");
 const controller = require("../emulator/controller");
 const config_1 = require("../config");

package/lib/emulator/controller.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.exportEmulatorData = exports.startAll = exports.shouldStart = exports.filterEmulatorTargets = exports.cleanShutdown = exports.onExit = exports.exportOnExit = exports.startEmulator = void 0;
-const clc = require("cli-color");
+const clc = require("colorette");
 const fs = require("fs");
 const path = require("path");
 const logger_1 = require("../logger");

package/lib/emulator/databaseEmulator.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DatabaseEmulator = void 0;
 const chokidar = require("chokidar");
-const clc = require("cli-color");
+const clc = require("colorette");
 const fs = require("fs");
 const path = require("path");
 const http = require("http");

package/lib/emulator/downloadableEmulators.js

@@ -7,7 +7,7 @@ const error_1 = require("../error");
 const childProcess = require("child_process");
 const utils = require("../utils");
 const emulatorLogger_1 = require("./emulatorLogger");
-const clc = require("cli-color");
+const clc = require("colorette");
 const fs = require("fs-extra");
 const path = require("path");
 const os = require("os");

package/lib/emulator/emulatorLogger.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EmulatorLogger = exports.Verbosity = void 0;
-const clc = require("cli-color");
+const clc = require("colorette");
 const utils = require("../utils");
 const logger_1 = require("../logger");
 const utils_1 = require("../utils");

package/lib/emulator/extensionsEmulator.js

@@ -4,7 +4,7 @@ exports.ExtensionsEmulator = void 0;
 const fs = require("fs-extra");
 const os = require("os");
 const path = require("path");
-const clc = require("cli-color");
+const clc = require("colorette");
 const Table = require("cli-table");
 const spawn = require("cross-spawn");
 const planner = require("../deploy/extensions/planner");
@@ -186,7 +186,7 @@ class ExtensionsEmulator {
                     apiToWarn.apiName,
                     apiToWarn.instanceIds,
                     apiToWarn.enabled ? "Yes" : "No",
-                    apiToWarn.enabled ? "" : clc.bold.underline(enablementUri),
+                    apiToWarn.enabled ? "" : clc.bold(clc.underline(enablementUri)),
                 ]);
             }
             if (constants_1.Constants.isDemoProject(this.args.projectId)) {

package/lib/emulator/firestoreEmulator.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.FirestoreEmulator = void 0;
 const chokidar = require("chokidar");
 const fs = require("fs");
-const clc = require("cli-color");
+const clc = require("colorette");
 const path = require("path");
 const utils = require("../utils");
 const downloadableEmulators = require("./downloadableEmulators");

package/lib/emulator/functionsEmulator.js

@@ -4,7 +4,7 @@ exports.FunctionsEmulator = void 0;
 const fs = require("fs");
 const path = require("path");
 const express = require("express");
-const clc = require("cli-color");
+const clc = require("colorette");
 const http = require("http");
 const jwt = require("jsonwebtoken");
 const cors = require("cors");
@@ -245,15 +245,9 @@ class FunctionsEmulator {
             await this.destroyServer();
         }
     }
-    async loadTriggers(emulatableBackend, force = false) {
-        this.workerPool.refresh();
-        if (!emulatableBackend.nodeBinary) {
-            throw new error_1.FirebaseError(`No node binary for ${emulatableBackend.functionsDir}. This should never happen.`);
-        }
-        this.blockingFunctionsConfig = {};
-        let triggerDefinitions;
+    async discoverTriggers(emulatableBackend) {
         if (emulatableBackend.predefinedTriggers) {
-            triggerDefinitions = (0, functionsEmulatorShared_1.emulatedFunctionsByRegion)(emulatableBackend.predefinedTriggers, emulatableBackend.secretEnv);
+            return (0, functionsEmulatorShared_1.emulatedFunctionsByRegion)(emulatableBackend.predefinedTriggers, emulatableBackend.secretEnv);
         }
         else {
             const runtimeConfig = this.getRuntimeConfig(emulatableBackend);
@@ -284,8 +278,26 @@ class FunctionsEmulator {
             for (const e of endpoints) {
                 e.codebase = emulatableBackend.codebase;
             }
-            triggerDefinitions = (0, functionsEmulatorShared_1.emulatedFunctionsFromEndpoints)(endpoints);
+            return (0, functionsEmulatorShared_1.emulatedFunctionsFromEndpoints)(endpoints);
+        }
+    }
+    async loadTriggers(emulatableBackend, force = false) {
+        if (!emulatableBackend.nodeBinary) {
+            throw new error_1.FirebaseError(`No node binary for ${emulatableBackend.functionsDir}. This should never happen.`);
         }
+        let triggerDefinitions = [];
+        try {
+            triggerDefinitions = await this.discoverTriggers(emulatableBackend);
+            this.logger.logLabeled("SUCCESS", "functions", `Loaded functions definitions from source: ${triggerDefinitions
+                .map((t) => t.entryPoint)
+                .join(", ")}.`);
+        }
+        catch (e) {
+            this.logger.logLabeled("ERROR", "functions", `Failed to load function definition from source: ${e}`);
+            return;
+        }
+        this.workerPool.refresh();
+        this.blockingFunctionsConfig = {};
         const toSetup = triggerDefinitions.filter((definition) => {
             if (force) {
                 return true;

package/lib/emulator/functionsEmulatorShared.js

@@ -8,20 +8,11 @@ const crypto_1 = require("crypto");
 const _ = require("lodash");
 const backend = require("../deploy/functions/backend");
 const constants_1 = require("./constants");
-const proto_1 = require("../gcp/proto");
 const manifest_1 = require("../extensions/manifest");
 const extensionsHelper_1 = require("../extensions/extensionsHelper");
 const postinstall_1 = require("./extensions/postinstall");
 const services_1 = require("../deploy/functions/services");
 const prepare_1 = require("../deploy/functions/prepare");
-const memoryLookup = {
-    "128MB": 128,
-    "256MB": 256,
-    "512MB": 512,
-    "1GB": 1024,
-    "2GB": 2048,
-    "4GB": 4096,
-};
 class HttpConstants {
 }
 exports.HttpConstants = HttpConstants;
@@ -33,7 +24,7 @@ class EmulatedTrigger {
         this.module = module;
     }
     get memoryLimitBytes() {
-        return memoryLookup[this.definition.availableMemoryMb || "128MB"] * 1024 * 1024;
+        return (this.definition.availableMemoryMb || 128) * 1024 * 1024;
     }
     get timeoutMs() {
         return (this.definition.timeoutSeconds || 60) * 1000;
@@ -69,7 +60,11 @@ function emulatedFunctionsFromEndpoints(endpoints) {
             id: `${endpoint.region}-${endpoint.id}`,
             codebase: endpoint.codebase,
         };
-        (0, proto_1.copyIfPresent)(def, endpoint, "availableMemoryMb", "labels", "timeoutSeconds", "platform", "secretEnvironmentVariables");
+        def.availableMemoryMb = endpoint.availableMemoryMb || 256;
+        def.labels = endpoint.labels || {};
+        def.timeoutSeconds = endpoint.timeoutSeconds || 60;
+        def.secretEnvironmentVariables = endpoint.secretEnvironmentVariables || [];
+        def.platform = endpoint.platform;
         if (backend.isHttpsTriggered(endpoint)) {
             def.httpsTrigger = endpoint.httpsTrigger;
         }

package/lib/emulator/loggingEmulator.js

@@ -7,7 +7,7 @@ const triple_beam_1 = require("triple-beam");
 const WebSocket = require("ws");
 const TransportStream = require("winston-transport");
 const logger_1 = require("../logger");
-const ansiStrip = require("cli-color/strip");
+const stripAnsi = require("strip-ansi");
 class LoggingEmulator {
     constructor(args) {
         this.args = args;
@@ -106,7 +106,7 @@ class WebSocketTransport extends TransportStream {
         if (bundle.data && bundle.data.metadata && bundle.data.metadata.message) {
             bundle.message = bundle.data.metadata.message;
         }
-        bundle.message = ansiStrip(bundle.message);
+        bundle.message = stripAnsi(bundle.message);
         this.history.push(bundle);
         this.connections.forEach((ws) => {
             ws.send(JSON.stringify(bundle));

package/lib/emulator/storage/apis/firebase.js

@@ -121,10 +121,22 @@ function createFirebaseEndpoints(emulator) {
         var _a, _b, _c, _d;
         const maxResults = (_a = req.query.maxResults) === null || _a === void 0 ? void 0 : _a.toString();
         let listResponse;
+        let prefix = "";
+        if (req.query.prefix) {
+            prefix = req.query.prefix.toString();
+            if (prefix.charAt(prefix.length - 1) !== "/") {
+                return res.status(400).json({
+                    error: {
+                        code: 400,
+                        message: "The prefix parameter is required to be empty or ends with a single / character.",
+                    },
+                });
+            }
+        }
         try {
             listResponse = await storageLayer.listObjects({
                 bucketId: req.params.bucketId,
-                prefix: req.query.prefix ? req.query.prefix.toString() : "",
+                prefix: prefix,
                 delimiter: req.query.delimiter ? req.query.delimiter.toString() : "",
                 pageToken: (_b = req.query.pageToken) === null || _b === void 0 ? void 0 : _b.toString(),
                 maxResults: maxResults ? +maxResults : undefined,

package/lib/emulator/storage/apis/gcloud.js

@@ -177,14 +177,6 @@ function createCloudEndpoints(emulator) {
         });
     });
     gcloudStorageAPI.post("/upload/storage/v1/b/:bucketId/o", async (req, res) => {
-        if (!req.query.name) {
-            res.sendStatus(400);
-            return;
-        }
-        let name = req.query.name.toString();
-        if (name.startsWith("/")) {
-            name = name.slice(1);
-        }
         const contentTypeHeader = req.header("content-type") || req.header("x-upload-content-type");
         if (!contentTypeHeader) {
             return res.sendStatus(400);
@@ -194,6 +186,11 @@ function createCloudEndpoints(emulator) {
             if (emulatorInfo === undefined) {
                 return res.sendStatus(500);
             }
+            const name = getIncomingFileNameFromRequest(req.query, req.body);
+            if (name === undefined) {
+                res.sendStatus(400);
+                return;
+            }
             const upload = uploadService.startResumableUpload({
                 bucketId: req.params.bucketId,
                 objectId: name,
@@ -223,6 +220,11 @@ function createCloudEndpoints(emulator) {
             }
             throw err;
         }
+        const name = getIncomingFileNameFromRequest(req.query, JSON.parse(metadataRaw));
+        if (name === undefined) {
+            res.sendStatus(400);
+            return;
+        }
         const upload = uploadService.multipartUpload({
             bucketId: req.params.bucketId,
             objectId: name,
@@ -363,3 +365,8 @@ function sendObjectNotFound(req, res) {
         });
     }
 }
+function getIncomingFileNameFromRequest(query, metadata) {
+    var _a;
+    const name = ((_a = query === null || query === void 0 ? void 0 : query.name) === null || _a === void 0 ? void 0 : _a.toString()) || (metadata === null || metadata === void 0 ? void 0 : metadata.name);
+    return (name === null || name === void 0 ? void 0 : name.startsWith("/")) ? name.slice(1) : name;
+}

package/lib/emulator/storage/files.js

@@ -18,9 +18,8 @@ const adminSdkConfig_1 = require("../adminSdkConfig");
 const types_1 = require("./rules/types");
 const upload_1 = require("./upload");
 class StoredFile {
-    constructor(metadata, path) {
+    constructor(metadata) {
         this.metadata = metadata;
-        this._path = path;
     }
     get metadata() {
         return this._metadata;
@@ -28,14 +27,9 @@ class StoredFile {
     set metadata(value) {
         this._metadata = value;
     }
-    get path() {
-        return this._path;
-    }
-    set path(value) {
-        this._path = value;
-    }
 }
 exports.StoredFile = StoredFile;
+const TRAILING_SLASHES_PATTERN = /\/+$/;
 class StorageLayer {
     constructor(_projectId, _files, _buckets, _rulesValidator, _adminCredsValidator, _persistence, _cloudFunctions) {
         this._projectId = _projectId;
@@ -144,6 +138,7 @@ class StorageLayer {
         if (upload.status !== upload_1.UploadStatus.FINISHED) {
             throw new Error(`Unexpected upload status encountered: ${upload.status}.`);
         }
+        const storedMetadata = this.getMetadata(upload.bucketId, upload.objectId);
         const filePath = this.path(upload.bucketId, upload.objectId);
         const metadata = new metadata_1.StoredFileMetadata({
             name: upload.objectId,
@@ -156,14 +151,17 @@ class StorageLayer {
             customMetadata: upload.metadata.metadata,
         }, this._cloudFunctions, this._persistence.readBytes(upload.path, upload.size));
         metadata.update(upload.metadata, false);
-        const authorized = await this._rulesValidator.validate(["b", upload.bucketId, "o", upload.objectId].join("/"), upload.bucketId, types_1.RulesetOperationMethod.CREATE, { after: metadata === null || metadata === void 0 ? void 0 : metadata.asRulesResource() }, upload.authorization);
+        const authorized = await this._rulesValidator.validate(["b", upload.bucketId, "o", upload.objectId].join("/"), upload.bucketId, types_1.RulesetOperationMethod.CREATE, {
+            before: storedMetadata === null || storedMetadata === void 0 ? void 0 : storedMetadata.asRulesResource(),
+            after: metadata === null || metadata === void 0 ? void 0 : metadata.asRulesResource(),
+        }, upload.authorization);
         if (!authorized) {
             this._persistence.deleteFile(upload.path);
             throw new errors_1.ForbiddenError();
         }
         this._persistence.deleteFile(filePath, true);
         this._persistence.renameFile(upload.path, filePath);
-        this._files.set(filePath, new StoredFile(metadata, this._persistence.getDiskPath(filePath)));
+        this._files.set(filePath, new StoredFile(metadata));
         this._cloudFunctions.dispatch("finalize", new metadata_1.CloudStorageObjectMetadata(metadata));
         return metadata;
     }
@@ -202,7 +200,7 @@ class StorageLayer {
             cacheControl: newMetadata.cacheControl,
             customMetadata: newMetadata.metadata,
         }, this._cloudFunctions, sourceBytes, incomingMetadata);
-        const file = new StoredFile(copiedFileMetadata, this._persistence.getDiskPath(destinationFilePath));
+        const file = new StoredFile(copiedFileMetadata);
         this._files.set(destinationFilePath, file);
         this._cloudFunctions.dispatch("finalize", new metadata_1.CloudStorageObjectMetadata(file.metadata));
         return file.metadata;
@@ -210,7 +208,7 @@ class StorageLayer {
     async listObjects(request) {
         var _a;
         const { bucketId, prefix, delimiter, pageToken, authorization } = request;
-        const authorized = await this._rulesValidator.validate(["b", bucketId, "o", prefix].join("/"), bucketId, types_1.RulesetOperationMethod.LIST, {}, authorization);
+        const authorized = await this._rulesValidator.validate(["b", bucketId, "o", prefix.replace(TRAILING_SLASHES_PATTERN, "")].join("/"), bucketId, types_1.RulesetOperationMethod.LIST, {}, authorization, delimiter);
         if (!authorized) {
             throw new errors_1.ForbiddenError();
         }
@@ -306,13 +304,14 @@ class StorageLayer {
         await fse.writeFile(bucketsFilePath, JSON.stringify(bucketsList, undefined, 2));
         const blobsDirPath = path.join(storageExportPath, "blobs");
         await fse.ensureDir(blobsDirPath);
-        await fse.copy(this.dirPath, blobsDirPath, { recursive: true });
         const metadataDirPath = path.join(storageExportPath, "metadata");
         await fse.ensureDir(metadataDirPath);
         try {
             for (var _b = __asyncValues(this._files.entries()), _c; _c = await _b.next(), !_c.done;) {
-                const [p, file] = _c.value;
-                const metadataExportPath = path.join(metadataDirPath, encodeURIComponent(p)) + ".json";
+                const [, file] = _c.value;
+                const diskFileName = this._persistence.getDiskFileName(this.path(file.metadata.bucket, file.metadata.name));
+                await fse.copy(path.join(this.dirPath, diskFileName), path.join(blobsDirPath, diskFileName));
+                const metadataExportPath = path.join(metadataDirPath, encodeURIComponent(diskFileName)) + ".json";
                 await fse.writeFile(metadataExportPath, metadata_1.StoredFileMetadata.toJSON(file.metadata));
             }
         }
@@ -333,6 +332,10 @@ class StorageLayer {
         }
         const metadataDir = path.join(storageExportPath, "metadata");
         const blobsDir = path.join(storageExportPath, "blobs");
+        if (!(0, fs_1.existsSync)(metadataDir) || !(0, fs_1.existsSync)(blobsDir)) {
+            logger_1.logger.warn(`Could not find metadata directory at "${metadataDir}" and/or blobs directory at "${blobsDir}".`);
+            return;
+        }
         const metadataList = this.walkDirSync(metadataDir);
         const dotJson = ".json";
         for (const f of metadataList) {
@@ -348,15 +351,14 @@ class StorageLayer {
                 logger_1.logger.warn(`Could not find file "${blobPath}" in storage export.`);
                 continue;
             }
-            let decodedBlobPath = decodeURIComponent(blobPath);
-            const decodedBlobPathSep = getPathSep(decodedBlobPath);
-            if (decodedBlobPathSep !== path.sep) {
-                decodedBlobPath = decodedBlobPath.split(decodedBlobPathSep).join(path.sep);
+            let fileName = metadata.name;
+            const objectNameSep = getPathSep(fileName);
+            if (fileName !== path.sep) {
+                fileName = fileName.split(objectNameSep).join(path.sep);
             }
-            const blobDiskPath = this._persistence.getDiskPath(decodedBlobPath);
-            const file = new StoredFile(metadata, blobDiskPath);
-            this._files.set(decodedBlobPath, file);
-            fse.copyFileSync(blobAbsPath, blobDiskPath);
+            const filepath = this.path(metadata.bucket, fileName);
+            this._persistence.copyFromExternalPath(blobAbsPath, filepath);
+            this._files.set(filepath, new StoredFile(metadata));
         }
     }
     *walkDirSync(dir) {
@@ -374,6 +376,6 @@ class StorageLayer {
 }
 exports.StorageLayer = StorageLayer;
 function getPathSep(decodedPath) {
-    const firstSepIndex = decodedPath.search(/[^a-z0-9-_.]/g);
+    const firstSepIndex = decodedPath.search(/[\/|\\\\]/g);
     return decodedPath[firstSepIndex];
 }