firebase-tools 12.2.0 → 12.2.1

package/lib/emulator/storage/index.js

@@ -82,11 +82,6 @@ class StorageEmulator {
     getApp() {
         return this._app;
     }
-    async replaceRules(rules) {
-        await this._rulesManager.stop();
-        this._rulesManager = this.createRulesManager(rules);
-        return this._rulesManager.start();
-    }
     createRulesManager(rules) {
         return (0, manager_1.createStorageRulesManager)(rules, this._rulesRuntime);
     }

package/lib/emulator/storage/rules/manager.js

@@ -20,6 +20,7 @@ class DefaultStorageRulesManager {
         this._rules = _rules;
     }
     async start() {
+        this._runtime.start();
         const issues = await this.loadRuleset();
         this.updateWatcher(this._rules.name);
         return issues;
@@ -29,6 +30,9 @@ class DefaultStorageRulesManager {
     }
     async stop() {
         await this._watcher.close();
+        if (this._runtime.alive) {
+            await this._runtime.stop();
+        }
     }
     updateWatcher(rulesFile) {
         this._watcher = chokidar

package/lib/emulator/storage/rules/runtime.js

@@ -71,6 +71,9 @@ class StorageRulesRuntime {
     }
     async start(autoDownload = true) {
         var _a, _b;
+        if (this.alive) {
+            return;
+        }
         const downloadDetails = downloadableEmulators_1.DownloadDetails[types_2.Emulators.STORAGE];
         const hasEmulator = fs.existsSync(downloadDetails.downloadPath);
         if (!hasEmulator) {
@@ -90,11 +93,11 @@ class StorageRulesRuntime {
         this._childprocess = (0, cross_spawn_1.spawn)(command.binary, command.args, {
             stdio: ["pipe", "pipe", "pipe"],
         });
-        this._childprocess.on("exit", (code) => {
+        this._childprocess.on("exit", () => {
+            var _a;
             this._alive = false;
-            if (code !== 130) {
-                throw new error_1.FirebaseError("Storage Emulator Rules runtime exited unexpectedly.");
-            }
+            (_a = this._childprocess) === null || _a === void 0 ? void 0 : _a.removeAllListeners();
+            this._childprocess = undefined;
         });
         const startPromise = new Promise((resolve) => {
             this._requests[-1] = {
@@ -152,12 +155,23 @@ class StorageRulesRuntime {
         return startPromise;
     }
     stop() {
-        var _a;
-        (_a = this._childprocess) === null || _a === void 0 ? void 0 : _a.kill("SIGINT");
+        emulatorLogger_1.EmulatorLogger.forEmulator(types_2.Emulators.STORAGE).log("DEBUG", "Stopping rules runtime.");
+        return new Promise((resolve) => {
+            var _a;
+            if (this.alive) {
+                this._childprocess.on("exit", () => {
+                    resolve();
+                });
+                (_a = this._childprocess) === null || _a === void 0 ? void 0 : _a.kill("SIGINT");
+            }
+            else {
+                resolve();
+            }
+        });
     }
     async _sendRequest(rab, overrideId) {
         if (!this._childprocess) {
-            throw new error_1.FirebaseError("Attempted to send Cloud Storage rules request before child was ready");
+            throw new error_1.FirebaseError("Failed to send Cloud Storage rules request due to rules runtime not available.");
         }
         const runtimeActionRequest = Object.assign(Object.assign({}, rab), { id: overrideId !== null && overrideId !== void 0 ? overrideId : this._requestCount++ });
         if (overrideId !== undefined) {

package/lib/emulator/storage/server.js

@@ -8,7 +8,6 @@ const types_1 = require("../types");
 const bodyParser = require("body-parser");
 const gcloud_1 = require("./apis/gcloud");
 const firebase_1 = require("./apis/firebase");
-const errors_1 = require("../auth/errors");
 function createApp(defaultProjectId, emulator) {
     const { storageLayer } = emulator;
     const app = express();
@@ -51,54 +50,6 @@ function createApp(defaultProjectId, emulator) {
         await storageLayer.export(path, { initiatedBy });
         res.sendStatus(200);
     });
-    app.put("/internal/setRules", async (req, res) => {
-        const rulesRaw = req.body.rules;
-        if (!(rulesRaw && Array.isArray(rulesRaw.files) && rulesRaw.files.length > 0)) {
-            res.status(400).json({
-                message: "Request body must include 'rules.files' array",
-            });
-            return;
-        }
-        const { files } = rulesRaw;
-        function parseRulesFromFiles(files) {
-            if (files.length === 1) {
-                const file = files[0];
-                if (!isRulesFile(file)) {
-                    throw new errors_1.InvalidArgumentError("Each member of 'rules.files' array must contain 'name' and 'content'");
-                }
-                return { name: file.name, content: file.content };
-            }
-            const rules = [];
-            for (const file of files) {
-                if (!isRulesFile(file) || !file.resource) {
-                    throw new errors_1.InvalidArgumentError("Each member of 'rules.files' array must contain 'name', 'content', and 'resource'");
-                }
-                rules.push({ resource: file.resource, rules: { name: file.name, content: file.content } });
-            }
-            return rules;
-        }
-        let rules;
-        try {
-            rules = parseRulesFromFiles(files);
-        }
-        catch (err) {
-            if (err instanceof errors_1.InvalidArgumentError) {
-                res.status(400).json({ message: err.message });
-                return;
-            }
-            throw err;
-        }
-        const issues = await emulator.replaceRules(rules);
-        if (issues.errors.length > 0) {
-            res.status(400).json({
-                message: "There was an error updating rules, see logs for more details",
-            });
-            return;
-        }
-        res.status(200).json({
-            message: "Rules updated successfully",
-        });
-    });
     app.post("/internal/reset", (req, res) => {
         emulator.reset();
         res.sendStatus(200);
@@ -108,6 +59,3 @@ function createApp(defaultProjectId, emulator) {
     return Promise.resolve(app);
 }
 exports.createApp = createApp;
-function isRulesFile(file) {
-    return (typeof file.name === "string" && typeof file.content === "string");
-}

package/lib/frameworks/utils.js

@@ -183,6 +183,9 @@ function getFrameworksBuildTarget(purpose, validOptions) {
         }
         return frameworksBuild;
     }
+    else if (purpose === "deploy") {
+        return "production";
+    }
     else if (process.env.NODE_ENV) {
         switch (process.env.NODE_ENV) {
             case "development":
@@ -194,7 +197,7 @@ function getFrameworksBuildTarget(purpose, validOptions) {
                 throw new error_1.FirebaseError(`We cannot infer your build target from a non-standard NODE_ENV. Please set the FIREBASE_FRAMEWORKS_BUILD_TARGET environment variable. Valid values are: ${validOptions.join(", ")}`);
         }
     }
-    else if (purpose !== "serve") {
+    else if (purpose === "test") {
         return "production";
     }
     else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "firebase-tools",
-  "version": "12.2.0",
+  "version": "12.2.1",
   "description": "Command-Line Interface for Firebase",
   "main": "./lib/index.js",
   "bin": {

package/templates/init/storage/storage.rules

@@ -1,4 +1,8 @@
 rules_version = '2';
+
+// Craft rules based on data in your Firestore database
+// allow write: if firestore.get(
+//    /databases/(default)/documents/users/$(request.auth.uid)).data.isAdmin;
 service firebase.storage {
   match /b/{bucket}/o {
     match /{allPaths=**} {