firebase-tools 10.5.0 → 10.7.1

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

@@ -173,7 +173,7 @@ function createFirebaseEndpoints(emulator) {
                     return res.status(400).json({
                         error: {
                             code: 400,
-                            message: err.toString(),
+                            message: err.message,
                         },
                     });
                 }
@@ -201,7 +201,7 @@ function createFirebaseEndpoints(emulator) {
                 }
                 throw err;
             }
-            metadata.addDownloadToken();
+            metadata.addDownloadToken(false);
             return res.status(200).json(new metadata_1.OutgoingFirebaseMetadata(metadata));
         }
         const uploadCommand = req.header("x-goog-upload-command");
@@ -219,9 +219,13 @@ function createFirebaseEndpoints(emulator) {
             res.header("x-goog-upload-chunk-granularity", "10000");
             res.header("x-goog-upload-control-url", "");
             res.header("x-goog-upload-status", "active");
-            const emulatorInfo = registry_1.EmulatorRegistry.getInfo(types_1.Emulators.STORAGE);
-            res.header("x-goog-upload-url", `http://${req.hostname}:${emulatorInfo === null || emulatorInfo === void 0 ? void 0 : emulatorInfo.port}/v0/b/${bucketId}/o?name=${objectId}&upload_id=${upload.id}&upload_protocol=resumable`);
             res.header("x-gupload-uploadid", upload.id);
+            const uploadUrl = registry_1.EmulatorRegistry.url(types_1.Emulators.STORAGE, req);
+            uploadUrl.pathname = `/v0/b/${bucketId}/o`;
+            uploadUrl.searchParams.set("name", objectId);
+            uploadUrl.searchParams.set("upload_id", upload.id);
+            uploadUrl.searchParams.set("upload_protocol", "resumable");
+            res.header("x-goog-upload-url", uploadUrl.toString());
             return res.sendStatus(200);
         }
         if (!req.query.upload_id) {
@@ -291,9 +295,9 @@ function createFirebaseEndpoints(emulator) {
                 }
                 throw err;
             }
-            let metadata;
+            let storedMetadata;
             try {
-                metadata = await storageLayer.uploadObject(upload);
+                storedMetadata = await storageLayer.uploadObject(upload);
             }
             catch (err) {
                 if (err instanceof errors_1.ForbiddenError) {
@@ -306,8 +310,9 @@ function createFirebaseEndpoints(emulator) {
                 }
                 throw err;
             }
-            metadata.addDownloadToken();
-            return res.status(200).json(new metadata_1.OutgoingFirebaseMetadata(metadata));
+            res.header("x-goog-upload-status", "final");
+            storedMetadata.addDownloadToken(false);
+            return res.status(200).json(new metadata_1.OutgoingFirebaseMetadata(storedMetadata));
         }
         return res.sendStatus(400);
     };

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

@@ -200,9 +200,12 @@ function createCloudEndpoints(emulator) {
                 metadataRaw: JSON.stringify(req.body),
                 authorization: req.header("authorization"),
             });
-            const { host, port } = emulatorInfo;
-            const uploadUrl = `http://${host}:${port}/upload/storage/v1/b/${req.params.bucketId}/o?name=${name}&uploadType=resumable&upload_id=${upload.id}`;
-            return res.header("location", uploadUrl).sendStatus(200);
+            const uploadUrl = registry_1.EmulatorRegistry.url(types_1.Emulators.STORAGE, req);
+            uploadUrl.pathname = `/upload/storage/v1/b/${req.params.bucketId}/o`;
+            uploadUrl.searchParams.set("name", name);
+            uploadUrl.searchParams.set("uploadType", "resumable");
+            uploadUrl.searchParams.set("upload_id", upload.id);
+            return res.header("location", uploadUrl.toString()).sendStatus(200);
         }
         let metadataRaw;
         let dataRaw;
@@ -210,12 +213,15 @@ function createCloudEndpoints(emulator) {
             ({ metadataRaw, dataRaw } = (0, multipart_1.parseObjectUploadMultipartRequest)(contentTypeHeader, await (0, request_1.reqBodyToBuffer)(req)));
         }
         catch (err) {
-            return res.status(400).json({
-                error: {
-                    code: 400,
-                    message: err,
-                },
-            });
+            if (err instanceof Error) {
+                return res.status(400).json({
+                    error: {
+                        code: 400,
+                        message: err.message,
+                    },
+                });
+            }
+            throw err;
         }
         const upload = uploadService.multipartUpload({
             bucketId: req.params.bucketId,

package/lib/emulator/storage/files.js

@@ -155,6 +155,7 @@ class StorageLayer {
             cacheControl: upload.metadata.cacheControl,
             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);
         if (!authorized) {
             this._persistence.deleteFile(upload.path);
@@ -347,10 +348,16 @@ class StorageLayer {
                 logger_1.logger.warn(`Could not find file "${blobPath}" in storage export.`);
                 continue;
             }
-            const file = new StoredFile(metadata, blobPath);
-            this._files.set(blobPath, file);
+            let decodedBlobPath = decodeURIComponent(blobPath);
+            const decodedBlobPathSep = getPathSep(decodedBlobPath);
+            if (decodedBlobPathSep !== path.sep) {
+                decodedBlobPath = decodedBlobPath.split(decodedBlobPathSep).join(path.sep);
+            }
+            const blobDiskPath = this._persistence.getDiskPath(decodedBlobPath);
+            const file = new StoredFile(metadata, blobDiskPath);
+            this._files.set(decodedBlobPath, file);
+            fse.copyFileSync(blobAbsPath, blobDiskPath);
         }
-        fse.copySync(blobsDir, this.dirPath);
     }
     *walkDirSync(dir) {
         const files = (0, fs_1.readdirSync)(dir);
@@ -366,3 +373,7 @@ class StorageLayer {
     }
 }
 exports.StorageLayer = StorageLayer;
+function getPathSep(decodedPath) {
+    const firstSepIndex = decodedPath.search(/[^a-z0-9-_.]/g);
+    return decodedPath[firstSepIndex];
+}

package/lib/emulator/storage/index.js

@@ -21,7 +21,7 @@ class StorageEmulator {
         this._files = new Map();
         this._buckets = new Map();
         this._rulesRuntime = new runtime_1.StorageRulesRuntime();
-        this._rulesManager = (0, manager_1.createStorageRulesManager)(this.args.rules, this._rulesRuntime);
+        this._rulesManager = this.createRulesManager(this.args.rules);
         this._cloudFunctions = new cloudFunctions_1.StorageCloudFunctions(args.projectId);
         this._persistence = new persistence_1.Persistence(this.getPersistenceTmpDir());
         this._uploadService = new upload_1.UploadService(this._persistence);
@@ -82,6 +82,14 @@ 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);
+    }
     getPersistenceTmpDir() {
         return `${(0, os_1.tmpdir)()}/firebase/storage/blobs`;
     }

package/lib/emulator/storage/metadata.js

@@ -44,7 +44,7 @@ class StoredFileMetadata {
             throw new Error("Must pass bytes array or opts object with size, md5hash, and crc32c");
         }
         if (incomingMetadata) {
-            this.update(incomingMetadata);
+            this.update(incomingMetadata, false);
         }
         this.deleteFieldsSetAsNull();
         this.setDownloadTokensFromCustomMetadata();
@@ -86,8 +86,10 @@ class StoredFileMetadata {
         }
         if (this.customMetadata.firebaseStorageDownloadTokens) {
             this.downloadTokens = [
-                ...this.downloadTokens,
-                ...this.customMetadata.firebaseStorageDownloadTokens.split(","),
+                ...new Set([
+                    ...this.downloadTokens,
+                    ...this.customMetadata.firebaseStorageDownloadTokens.split(","),
+                ]),
             ];
             delete this.customMetadata.firebaseStorageDownloadTokens;
         }
@@ -115,7 +117,7 @@ class StoredFileMetadata {
             });
         }
     }
-    update(incoming) {
+    update(incoming, shouldTrigger = true) {
         if (incoming.contentDisposition) {
             this.contentDisposition = incoming.contentDisposition;
         }
@@ -143,15 +145,17 @@ class StoredFileMetadata {
         }
         this.setDownloadTokensFromCustomMetadata();
         this.deleteFieldsSetAsNull();
-        this._cloudFunctions.dispatch("metadataUpdate", new CloudStorageObjectMetadata(this));
+        if (shouldTrigger) {
+            this._cloudFunctions.dispatch("metadataUpdate", new CloudStorageObjectMetadata(this));
+        }
     }
-    addDownloadToken() {
+    addDownloadToken(shouldTrigger = true) {
         if (!this.downloadTokens.length) {
             this.downloadTokens.push(uuid.v4());
             return;
         }
         this.downloadTokens = [...this.downloadTokens, uuid.v4()];
-        this.update({});
+        this.update({}, shouldTrigger);
     }
     deleteDownloadToken(token) {
         if (!this.downloadTokens.length) {
@@ -160,7 +164,7 @@ class StoredFileMetadata {
         const remainingTokens = this.downloadTokens.filter((t) => t !== token);
         this.downloadTokens = remainingTokens;
         if (remainingTokens.length === 0) {
-            this.addDownloadToken();
+            this.addDownloadToken(false);
         }
         this.update({});
     }
@@ -265,6 +269,12 @@ class CloudStorageObjectMetadata {
         if (metadata.cacheControl) {
             this.cacheControl = metadata.cacheControl;
         }
+        if (metadata.contentDisposition) {
+            this.contentDisposition = metadata.contentDisposition;
+        }
+        if (metadata.contentEncoding) {
+            this.contentEncoding = metadata.contentEncoding;
+        }
         if (metadata.customTime) {
             this.customTime = toSerializedDate(metadata.customTime);
         }

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

@@ -5,6 +5,7 @@ const chokidar = require("chokidar");
 const emulatorLogger_1 = require("../../emulatorLogger");
 const types_1 = require("../../types");
 const runtime_1 = require("./runtime");
+const fsutils_1 = require("../../../fsutils");
 function createStorageRulesManager(rules, runtime) {
     return Array.isArray(rules)
         ? new ResourceBasedStorageRulesManager(rules, runtime)
@@ -18,31 +19,24 @@ class DefaultStorageRulesManager {
         this._logger = emulatorLogger_1.EmulatorLogger.forEmulator(types_1.Emulators.STORAGE);
         this._rules = _rules;
     }
-    start() {
-        return this.updateSourceFile(this._rules);
+    async start() {
+        const issues = await this.loadRuleset();
+        this.updateWatcher(this._rules.name);
+        return issues;
     }
     getRuleset() {
         return this._ruleset;
     }
-    async updateSourceFile(rules) {
-        const prevRulesFile = this._rules.name;
-        this._rules = rules;
-        const issues = await this.loadRuleset();
-        this.updateWatcher(rules.name, prevRulesFile);
-        return issues;
-    }
     async stop() {
         await this._watcher.close();
     }
-    updateWatcher(rulesFile, prevRulesFile) {
-        if (prevRulesFile) {
-            this._watcher.unwatch(prevRulesFile);
-        }
+    updateWatcher(rulesFile) {
         this._watcher = chokidar
             .watch(rulesFile, { persistent: true, ignoreInitial: true })
             .on("change", async () => {
             await new Promise((res) => setTimeout(res, 5));
             this._logger.logLabeled("BULLET", "storage", "Change detected, updating rules for Cloud Storage...");
+            this._rules.content = (0, fsutils_1.readFile)(rulesFile);
             await this.loadRuleset();
         });
     }
@@ -83,10 +77,6 @@ class ResourceBasedStorageRulesManager {
         var _a;
         return (_a = this._rulesManagers.get(resource)) === null || _a === void 0 ? void 0 : _a.getRuleset();
     }
-    updateSourceFile(rules, resource) {
-        const rulesManager = this._rulesManagers.get(resource) || this.createRulesManager(resource, rules);
-        return rulesManager.updateSourceFile(rules);
-    }
     async stop() {
         await Promise.all(Array.from(this._rulesManagers.values(), async (rulesManager) => await rulesManager.stop()));
     }

package/lib/emulator/storage/server.js

@@ -8,6 +8,7 @@ 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();
@@ -44,21 +45,43 @@ function createApp(defaultProjectId, emulator) {
         res.sendStatus(200);
     });
     app.put("/internal/setRules", async (req, res) => {
-        const rules = req.body.rules;
-        if (!(rules && Array.isArray(rules.files) && rules.files.length > 0)) {
-            res.status(400).send("Request body must include 'rules.files' array .");
+        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 file = rules.files[0];
-        if (!(file.name && file.content)) {
-            res
-                .status(400)
-                .send("Request body must include 'rules.files' array where each member contains 'name' and 'content'.");
-            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;
         }
-        const name = file.name;
-        const content = file.content;
-        const issues = await emulator.rulesManager.updateSourceFile({ name, content }, req.params.bucketId);
+        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",
@@ -78,3 +101,6 @@ 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/ensureApiEnabled.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.enableApiURI = exports.ensure = exports.check = exports.POLL_SETTINGS = void 0;
 const cli_color_1 = require("cli-color");
-const track = require("./track");
+const track_1 = require("./track");
 const api_1 = require("./api");
 const apiv2_1 = require("./apiv2");
 const utils = require("./utils");
@@ -16,7 +16,9 @@ const apiClient = new apiv2_1.Client({
     apiVersion: "v1",
 });
 async function check(projectId, apiName, prefix, silent = false) {
-    const res = await apiClient.get(`/projects/${projectId}/services/${apiName}`);
+    const res = await apiClient.get(`/projects/${projectId}/services/${apiName}`, {
+        skipLog: { resBody: true },
+    });
     const isEnabled = res.body.state === "ENABLED";
     if (isEnabled && !silent) {
         utils.logLabeledSuccess(prefix, `required API ${(0, cli_color_1.bold)(apiName)} is enabled`);
@@ -26,7 +28,9 @@ async function check(projectId, apiName, prefix, silent = false) {
 exports.check = check;
 async function enable(projectId, apiName) {
     try {
-        await apiClient.post(`/projects/${projectId}/services/${apiName}:enable`);
+        await apiClient.post(`/projects/${projectId}/services/${apiName}:enable`, undefined, {
+            skipLog: { resBody: true },
+        });
     }
     catch (err) {
         if ((0, error_1.isBillingError)(err)) {
@@ -46,7 +50,7 @@ async function pollCheckEnabled(projectId, apiName, prefix, silent, enablementRe
     });
     const isEnabled = await check(projectId, apiName, prefix, silent);
     if (isEnabled) {
-        void track("api_enabled", apiName);
+        void (0, track_1.track)("api_enabled", apiName);
         return;
     }
     if (!silent) {

package/lib/extensions/askUserForParam.js

@@ -172,12 +172,12 @@ async function promptSecretLocations(paramSpec) {
             choices: [
                 {
                     checked: true,
-                    name: "Google Cloud Secret Manager",
+                    name: "Google Cloud Secret Manager (Used by deployed extensions and emulator)",
                     value: SecretLocation.CLOUD.toString(),
                 },
                 {
                     checked: false,
-                    name: "Local file (Only used by Firebase Emulator)",
+                    name: "Local file (Used by emulator only)",
                     value: SecretLocation.LOCAL.toString(),
                 },
             ],
@@ -191,25 +191,28 @@ async function promptSecretLocations(paramSpec) {
         choices: [
             {
                 checked: false,
-                name: "Google Cloud Secret Manager",
+                name: "Google Cloud Secret Manager (Used by deployed extensions and emulator)",
                 value: SecretLocation.CLOUD.toString(),
             },
             {
                 checked: false,
-                name: "Local file (Only used by Firebase Emulator)",
+                name: "Local file (Used by emulator only)",
                 value: SecretLocation.LOCAL.toString(),
             },
         ],
     });
 }
 async function promptLocalSecret(instanceId, paramSpec) {
-    utils.logLabeledBullet(extensionsHelper_1.logPrefix, "Configure a local secret value for Extensions Emulator");
-    const value = await (0, prompt_1.promptOnce)({
-        name: paramSpec.param,
-        type: "input",
-        message: `This secret will be stored in ./extensions/${instanceId}.secret.local.\n` +
-            `Enter value for "${paramSpec.label.trim()}" to be used by Extensions Emulator:`,
-    });
+    let value;
+    do {
+        utils.logLabeledBullet(extensionsHelper_1.logPrefix, "Configure a local secret value for Extensions Emulator");
+        value = await (0, prompt_1.promptOnce)({
+            name: paramSpec.param,
+            type: "input",
+            message: `This secret will be stored in ./extensions/${instanceId}.secret.local.\n` +
+                `Enter value for "${paramSpec.label.trim()}" to be used by Extensions Emulator:`,
+        });
+    } while (!value);
     return value;
 }
 async function promptReconfigureSecret(projectId, instanceId, paramSpec) {

package/lib/extensions/changelog.js

@@ -16,7 +16,7 @@ marked.setOptions({
     renderer: new TerminalRenderer(),
 });
 const EXTENSIONS_CHANGELOG = "CHANGELOG.md";
-const VERSION_LINE_REGEX = /##.*(\d+\.\d+\.\d+).*/;
+const VERSION_LINE_REGEX = /##.*(\d+\.\d+\.\d+(?:-((\d+|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(\d+|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?).*/;
 async function getReleaseNotesForUpdate(args) {
     const releaseNotes = {};
     const filter = `id<="${args.toVersion}" AND id>"${args.fromVersion}"`;

package/lib/extensions/emulator/optionsHelper.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getParams = exports.getSecretEnvVars = exports.getNonSecretEnv = exports.getExtensionFunctionInfo = exports.buildOptions = void 0;
 const fs = require("fs-extra");
-const _ = require("lodash");
 const path = require("path");
 const paramHelper = require("../paramHelper");
 const specHelper = require("./specHelper");
@@ -10,6 +9,7 @@ const localHelper = require("../localHelper");
 const triggerHelper = require("./triggerHelper");
 const extensionsApi_1 = require("../extensionsApi");
 const extensionsHelper = require("../extensionsHelper");
+const planner = require("../../deploy/extensions/planner");
 const config_1 = require("../../config");
 const error_1 = require("../../error");
 const emulatorLogger_1 = require("../../emulator/emulatorLogger");
@@ -36,13 +36,13 @@ async function buildOptions(options) {
     return options;
 }
 exports.buildOptions = buildOptions;
-async function getExtensionFunctionInfo(extensionDir, instanceId, paramValues) {
-    const spec = await specHelper.readExtensionYaml(extensionDir);
+async function getExtensionFunctionInfo(instance, paramValues) {
+    const spec = await planner.getExtensionSpec(instance);
     const functionResources = specHelper.getFunctionResourcesWithParamSubstitution(spec, paramValues);
     const extensionTriggers = functionResources
         .map((r) => triggerHelper.functionResourceToEmulatedTriggerDefintion(r))
         .map((trigger) => {
-        trigger.name = `ext-${instanceId}-${trigger.name}`;
+        trigger.name = `ext-${instance.instanceId}-${trigger.name}`;
         return trigger;
     });
     const nodeMajorVersion = specHelper.getNodeVersion(functionResources);
@@ -159,12 +159,10 @@ function buildConfig(functionResources, testConfig) {
     return config;
 }
 function getFunctionSourceDirectory(functionResources) {
+    var _a;
     let sourceDirectory;
     for (const r of functionResources) {
-        let dir = _.get(r, "properties.sourceDirectory");
-        if (!dir) {
-            dir = "functions";
-        }
+        const dir = ((_a = r.properties) === null || _a === void 0 ? void 0 : _a.sourceDirectory) || "functions";
         if (!sourceDirectory) {
             sourceDirectory = dir;
         }
@@ -172,14 +170,15 @@ function getFunctionSourceDirectory(functionResources) {
             throw new error_1.FirebaseError(`Found function resources with different sourceDirectories: '${sourceDirectory}' and '${dir}'. The extensions emulator only supports a single sourceDirectory.`);
         }
     }
-    return sourceDirectory;
+    return sourceDirectory || "functions";
 }
 function shouldEmulateFunctions(resources) {
     return resources.length > 0;
 }
 function shouldEmulate(emulatorName, resources) {
+    var _a, _b;
     for (const r of resources) {
-        const eventType = _.get(r, "properties.eventTrigger.eventType", "");
+        const eventType = ((_b = (_a = r.properties) === null || _a === void 0 ? void 0 : _a.eventTrigger) === null || _b === void 0 ? void 0 : _b.eventType) || "";
         if (eventType.includes(emulatorName)) {
             return true;
         }

package/lib/extensions/emulator/specHelper.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getNodeVersion = exports.getFunctionProperties = exports.getFunctionResourcesWithParamSubstitution = exports.readFileFromDirectory = exports.readExtensionYaml = void 0;
+exports.getNodeVersion = exports.getFunctionProperties = exports.getFunctionResourcesWithParamSubstitution = exports.readFileFromDirectory = exports.readPostinstall = exports.readExtensionYaml = void 0;
 const yaml = require("js-yaml");
 const path = require("path");
 const fs = require("fs-extra");
@@ -8,6 +8,7 @@ const error_1 = require("../../error");
 const extensionsHelper_1 = require("../extensionsHelper");
 const functionsEmulatorUtils_1 = require("../../emulator/functionsEmulatorUtils");
 const SPEC_FILE = "extension.yaml";
+const POSTINSTALL_FILE = "POSTINSTALL.md";
 const validFunctionTypes = [
     "firebaseextensions.v1beta.function",
     "firebaseextensions.v1beta.scheduledFunction",
@@ -29,6 +30,11 @@ async function readExtensionYaml(directory) {
     return wrappedSafeLoad(source);
 }
 exports.readExtensionYaml = readExtensionYaml;
+async function readPostinstall(directory) {
+    const content = await readFileFromDirectory(directory, POSTINSTALL_FILE);
+    return content.source;
+}
+exports.readPostinstall = readPostinstall;
 function readFileFromDirectory(directory, file) {
     return new Promise((resolve, reject) => {
         fs.readFile(path.resolve(directory, file), "utf8", (err, data) => {

package/lib/extensions/emulator/triggerHelper.js

@@ -1,32 +1,29 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.functionResourceToEmulatedTriggerDefintion = void 0;
-const _ = require("lodash");
 const functionsEmulatorShared_1 = require("../../emulator/functionsEmulatorShared");
 const emulatorLogger_1 = require("../../emulator/emulatorLogger");
 const types_1 = require("../../emulator/types");
+const proto = require("../../gcp/proto");
 function functionResourceToEmulatedTriggerDefintion(resource) {
     const etd = {
         name: resource.name,
         entryPoint: resource.name,
         platform: "gcfv1",
     };
-    const properties = _.get(resource, "properties", {});
-    if (properties.timeout) {
-        etd.timeout = properties.timeout;
-    }
-    if (properties.location) {
-        etd.regions = [properties.location];
-    }
-    if (properties.availableMemoryMb) {
-        etd.availableMemoryMb = properties.availableMemoryMb;
-    }
+    const properties = resource.properties || {};
+    proto.renameIfPresent(etd, properties, "timeoutSeconds", "timeout", proto.secondsFromDuration);
+    proto.renameIfPresent(etd, properties, "regions", "location", (str) => [str]);
+    proto.copyIfPresent(etd, properties, "availableMemoryMb");
     if (properties.httpsTrigger) {
         etd.httpsTrigger = properties.httpsTrigger;
     }
-    else if (properties.eventTrigger) {
-        properties.eventTrigger.service = (0, functionsEmulatorShared_1.getServiceFromEventType)(properties.eventTrigger.eventType);
-        etd.eventTrigger = properties.eventTrigger;
+    if (properties.eventTrigger) {
+        etd.eventTrigger = {
+            eventType: properties.eventTrigger.eventType,
+            resource: properties.eventTrigger.resource,
+            service: (0, functionsEmulatorShared_1.getServiceFromEventType)(properties.eventTrigger.eventType),
+        };
     }
     else {
         emulatorLogger_1.EmulatorLogger.forEmulator(types_1.Emulators.FUNCTIONS).log("WARN", `Function '${resource.name} is missing a trigger in extension.yaml. Please add one, as triggers defined in code are ignored.`);

package/lib/extensions/extensionsApi.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getExtension = exports.deleteExtension = exports.unpublishExtension = exports.publishExtensionVersion = exports.undeprecateExtensionVersion = exports.deprecateExtensionVersion = exports.registerPublisherProfile = exports.getPublisherProfile = exports.listExtensionVersions = exports.listExtensions = exports.getExtensionVersion = exports.getSource = exports.createSource = exports.updateInstanceFromRegistry = exports.updateInstance = exports.configureInstance = exports.listInstances = exports.getInstance = exports.deleteInstance = exports.createInstance = exports.ParamType = exports.Visibility = exports.RegistryLaunchStage = void 0;
+exports.getExtension = exports.deleteExtension = exports.unpublishExtension = exports.publishExtensionVersion = exports.undeprecateExtensionVersion = exports.deprecateExtensionVersion = exports.registerPublisherProfile = exports.getPublisherProfile = exports.listExtensionVersions = exports.listExtensions = exports.getExtensionVersion = exports.getSource = exports.createSource = exports.updateInstanceFromRegistry = exports.updateInstance = exports.configureInstance = exports.listInstances = exports.getInstance = exports.deleteInstance = exports.createInstance = exports.ParamType = exports.FUNCTIONS_RESOURCE_TYPE = exports.Visibility = exports.RegistryLaunchStage = void 0;
 const yaml = require("js-yaml");
 const clc = require("cli-color");
 const { marked } = require("marked");
@@ -26,6 +26,7 @@ var Visibility;
     Visibility["UNLISTED"] = "unlisted";
     Visibility["PUBLIC"] = "public";
 })(Visibility = exports.Visibility || (exports.Visibility = {}));
+exports.FUNCTIONS_RESOURCE_TYPE = "firebaseextensions.v1beta.function";
 var ParamType;
 (function (ParamType) {
     ParamType["STRING"] = "STRING";