firebase-tools 11.28.0 → 11.29.0

package/lib/commands/database-import.js

@@ -16,12 +16,17 @@ const database_1 = require("../management/database");
 const api_1 = require("../database/api");
 const requireDatabaseInstance_1 = require("../requireDatabaseInstance");
 const requirePermissions_1 = require("../requirePermissions");
+const MAX_CHUNK_SIZE_MB = 10;
+const MAX_PAYLOAD_SIZE_MB = 256;
+const CONCURRENCY_LIMIT = 5;
 exports.command = new command_1.Command("database:import <path> [infile]")
     .description("non-atomically import the contents of a JSON file to the specified path in Realtime Database")
     .withForce()
     .option("--instance <instance>", "use the database <instance>.firebaseio.com (if omitted, use default database instance)")
     .option("--disable-triggers", "suppress any Cloud functions triggered by this operation, default to true", true)
     .option("--filter <dataPath>", "import only data at this path in the JSON file (if omitted, import entire file)")
+    .option("--chunk-size <mb>", "max chunk size in megabytes, default to 10 MB")
+    .option("--concurrency <val>", "concurrency limit, default to 5")
     .before(requirePermissions_1.requirePermissions, ["firebasedatabase.instances.update"])
     .before(requireDatabaseInstance_1.requireDatabaseInstance)
     .before(database_1.populateInstanceDetails)
@@ -33,6 +38,10 @@ exports.command = new command_1.Command("database:import <path> [infile]")
     if (!infile) {
         throw new error_1.FirebaseError("No file supplied");
     }
+    const chunkMegabytes = options.chunkSize ? parseInt(options.chunkSize, 10) : MAX_CHUNK_SIZE_MB;
+    if (chunkMegabytes > MAX_PAYLOAD_SIZE_MB) {
+        throw new error_1.FirebaseError("Max chunk size cannot exceed 256 MB");
+    }
     const projectId = (0, projectUtils_1.needProjectId)(options);
     const origin = (0, api_1.realtimeOriginOrEmulatorOrCustomUrl)(options.instanceDetails.databaseUrl);
     const dbPath = utils.getDatabaseUrl(origin, options.instance, path);
@@ -51,7 +60,9 @@ exports.command = new command_1.Command("database:import <path> [infile]")
     }
     const inStream = fs.createReadStream(infile);
     const dataPath = options.filter || "";
-    const importer = new import_1.default(dbUrl, inStream, dataPath);
+    const chunkBytes = chunkMegabytes * 1024 * 1024;
+    const concurrency = options.concurrency ? parseInt(options.concurrency, 10) : CONCURRENCY_LIMIT;
+    const importer = new import_1.default(dbUrl, inStream, dataPath, chunkBytes, concurrency);
     let responses;
     try {
         responses = await importer.execute();

package/lib/commands/ext-configure.js

@@ -32,7 +32,7 @@ exports.command = new command_1.Command("ext:configure <extensionInstanceId>")
     .before(checkMinRequiredVersion_1.checkMinRequiredVersion, "extMinVersion")
     .before(extensionsHelper_1.diagnoseAndFixProject)
     .action(async (instanceId, options) => {
-    var _a;
+    var _a, _b;
     const projectId = (0, projectUtils_1.getProjectId)(options);
     if (options.nonInteractive) {
         throw new error_1.FirebaseError(`Command not supported in non-interactive mode, edit ./extensions/${instanceId}.env directly instead. ` +
@@ -57,7 +57,7 @@ exports.command = new command_1.Command("ext:configure <extensionInstanceId>")
         instanceId,
         projectDir: config.projectDir,
     });
-    const [immutableParams, tbdParams] = (0, functional_1.partition)(spec.params.concat((_a = spec.systemParams) !== null && _a !== void 0 ? _a : []), (param) => { var _a; return (_a = param.immutable) !== null && _a !== void 0 ? _a : false; });
+    const [immutableParams, tbdParams] = (0, functional_1.partition)(((_a = spec.params) !== null && _a !== void 0 ? _a : []).concat((_b = spec.systemParams) !== null && _b !== void 0 ? _b : []), (param) => { var _a; return (_a = param.immutable) !== null && _a !== void 0 ? _a : false; });
     infoImmutableParams(immutableParams, oldParamValues);
     paramHelper.setNewDefaults(tbdParams, oldParamValues);
     const mutableParamsBindingOptions = await paramHelper.getParams({

package/lib/commands/ext-install.js

@@ -121,7 +121,7 @@ async function infoExtensionVersion(args) {
     await (0, warnings_1.displayWarningPrompts)(ref.publisherId, args.extensionVersion);
 }
 async function installToManifest(options) {
-    var _a, _b;
+    var _a, _b, _c;
     const { projectId, extensionName, extVersion, source, paramsEnvPath, nonInteractive, force } = options;
     const isLocalSource = (0, extensionsHelper_1.isLocalPath)(extensionName);
     const spec = (_a = extVersion === null || extVersion === void 0 ? void 0 : extVersion.spec) !== null && _a !== void 0 ? _a : source === null || source === void 0 ? void 0 : source.spec;
@@ -138,7 +138,7 @@ async function installToManifest(options) {
     }
     const paramBindingOptions = await paramHelper.getParams({
         projectId,
-        paramSpecs: spec.params.concat((_b = spec.systemParams) !== null && _b !== void 0 ? _b : []),
+        paramSpecs: ((_b = spec.params) !== null && _b !== void 0 ? _b : []).concat((_c = spec.systemParams) !== null && _c !== void 0 ? _c : []),
         nonInteractive,
         paramsEnvPath,
         instanceId,

package/lib/database/import.js

@@ -8,16 +8,14 @@ const StreamObject = require("stream-json/streamers/StreamObject");
 const apiv2_1 = require("../apiv2");
 const error_1 = require("../error");
 const pLimit = require("p-limit");
-const MAX_CHUNK_SIZE = 1024 * 1024 * 10;
-const CONCURRENCY_LIMIT = 5;
 class DatabaseImporter {
-    constructor(dbUrl, inStream, dataPath, chunkSize = MAX_CHUNK_SIZE) {
+    constructor(dbUrl, inStream, dataPath, chunkBytes, concurrency) {
         this.dbUrl = dbUrl;
         this.inStream = inStream;
         this.dataPath = dataPath;
-        this.chunkSize = chunkSize;
-        this.limit = pLimit(CONCURRENCY_LIMIT);
+        this.chunkBytes = chunkBytes;
         this.client = new apiv2_1.Client({ urlPrefix: dbUrl.origin, auth: true });
+        this.limit = pLimit(concurrency);
     }
     async execute() {
         await this.checkLocationIsEmpty();
@@ -107,7 +105,7 @@ class DatabaseImporter {
                     chunks.push(child);
                 }
             }
-            if (hasChunkedChild || size >= this.chunkSize) {
+            if (hasChunkedChild || size >= this.chunkBytes) {
                 return { chunks, size };
             }
             else {

package/lib/deploy/functions/params.js

@@ -8,6 +8,7 @@ const functional_1 = require("../../functional");
 const secretManager = require("../../gcp/secretManager");
 const storage_1 = require("../../gcp/storage");
 const cel_1 = require("./cel");
+const secrets_1 = require("../../functions/secrets");
 function dependenciesCEL(expr) {
     const deps = [];
     const paramCapture = /{{ params\.(\w+) }}/g;
@@ -221,8 +222,7 @@ async function handleSecret(secretParam, projectId) {
             type: "password",
             message: `This secret will be stored in Cloud Secret Manager (https://cloud.google.com/secret-manager/pricing) as ${secretParam.name}. Enter a value for ${secretParam.label || secretParam.name}:`,
         });
-        const secretLabel = { "firebase-hosting-managed": "yes" };
-        await secretManager.createSecret(projectId, secretParam.name, secretLabel);
+        await secretManager.createSecret(projectId, secretParam.name, (0, secrets_1.labels)());
         await secretManager.addVersion(projectId, secretParam.name, secretValue);
         return secretValue;
     }

package/lib/deploy/functions/validate.js

@@ -136,24 +136,13 @@ function functionsDirectoryExists(sourceDir, projectDir) {
 }
 exports.functionsDirectoryExists = functionsDirectoryExists;
 function functionIdsAreValid(functions) {
-    const v1FunctionName = /^[a-zA-Z][a-zA-Z0-9_-]{0,62}$/;
-    const invalidV1Ids = functions.filter((fn) => {
-        return fn.platform === "gcfv1" && !v1FunctionName.test(fn.id);
-    });
-    if (invalidV1Ids.length !== 0) {
-        const msg = `${invalidV1Ids.map((f) => f.id).join(", ")} function name(s) can only contain letters, ` +
+    const functionName = /^[a-zA-Z][a-zA-Z0-9_-]{0,62}$/;
+    const invalidIds = functions.filter((fn) => !functionName.test(fn.id));
+    if (invalidIds.length !== 0) {
+        const msg = `${invalidIds.map((f) => f.id).join(", ")} function name(s) can only contain letters, ` +
             `numbers, hyphens, and not exceed 62 characters in length`;
         throw new error_1.FirebaseError(msg);
     }
-    const v2FunctionName = /^[a-z][a-z0-9-]{0,62}$/;
-    const invalidV2Ids = functions.filter((fn) => {
-        return fn.platform === "gcfv2" && !v2FunctionName.test(fn.id);
-    });
-    if (invalidV2Ids.length !== 0) {
-        const msg = `${invalidV2Ids.map((f) => f.id).join(", ")} v2 function name(s) can only contain lower ` +
-            `case letters, numbers, hyphens, and not exceed 62 characters in length`;
-        throw new error_1.FirebaseError(msg);
-    }
 }
 exports.functionIdsAreValid = functionIdsAreValid;
 async function secretsAreValid(projectId, wantBackend) {

package/lib/emulator/downloadableEmulators.js

@@ -23,9 +23,9 @@ const EMULATOR_UPDATE_DETAILS = {
         expectedChecksum: "311609538bd65666eb724ef47c2e6466",
     },
     firestore: {
-        version: "1.16.2",
-        expectedSize: 64601019,
-        expectedChecksum: "83f379a5b3d367503a860497fea3a936",
+        version: "1.17.2",
+        expectedSize: 64907894,
+        expectedChecksum: "bc56ccf2419be3242e7b53def0a51566",
     },
     storage: {
         version: "1.1.3",

package/lib/extensions/extensionsApi.js

@@ -222,9 +222,10 @@ async function patchInstance(args) {
     });
     return pollRes;
 }
-function populateResourceProperties(spec) {
+function populateSpec(spec) {
+    var _a, _b;
     if (spec) {
-        spec.resources.forEach((r) => {
+        for (const r of spec.resources) {
             try {
                 if (r.propertiesYaml) {
                     r.properties = yaml.safeLoad(r.propertiesYaml);
@@ -233,7 +234,9 @@ function populateResourceProperties(spec) {
             catch (err) {
                 logger_1.logger.debug(`[ext] failed to parse resource properties yaml: ${err}`);
             }
-        });
+        }
+        spec.params = (_a = spec.params) !== null && _a !== void 0 ? _a : [];
+        spec.systemParams = (_b = spec.systemParams) !== null && _b !== void 0 ? _b : [];
     }
 }
 async function createSource(projectId, packageUri, extensionRoot) {
@@ -248,7 +251,7 @@ async function createSource(projectId, packageUri, extensionRoot) {
         masterTimeout: 600000,
     });
     if (pollRes.spec) {
-        populateResourceProperties(pollRes.spec);
+        populateSpec(pollRes.spec);
     }
     return pollRes;
 }
@@ -256,7 +259,7 @@ exports.createSource = createSource;
 async function getSource(sourceName) {
     const res = await apiClient.get(`/${sourceName}`);
     if (res.body.spec) {
-        populateResourceProperties(res.body.spec);
+        populateSpec(res.body.spec);
     }
     return res.body;
 }
@@ -269,7 +272,7 @@ async function getExtensionVersion(extensionVersionRef) {
     try {
         const res = await apiClient.get(`/${refs.toExtensionVersionName(ref)}`);
         if (res.body.spec) {
-            populateResourceProperties(res.body.spec);
+            populateSpec(res.body.spec);
         }
         return res.body;
     }

package/lib/frameworks/index.js

@@ -52,8 +52,15 @@ const DEFAULT_FIND_DEP_OPTIONS = {
 };
 exports.WebFrameworks = Object.fromEntries((0, fs_1.readdirSync)(__dirname)
     .filter((path) => (0, fs_1.statSync)((0, path_1.join)(__dirname, path)).isDirectory())
-    .map((path) => [path, require((0, path_1.join)(__dirname, path))])
-    .filter(([, obj]) => obj.name && obj.discover && obj.build && obj.type !== undefined && obj.support));
+    .map((path) => {
+    try {
+        return [path, require((0, path_1.join)(__dirname, path))];
+    }
+    catch (e) {
+        return [];
+    }
+})
+    .filter(([, obj]) => obj && obj.name && obj.discover && obj.build && obj.type !== undefined && obj.support));
 function relativeRequire(dir, mod) {
     try {
         const path = require.resolve(mod, { paths: [dir] });
@@ -113,11 +120,11 @@ function scanDependencyTree(searchingFor, dependencies = {}) {
 function getNodeModuleBin(name, cwd) {
     var _a;
     const cantFindExecutable = new error_1.FirebaseError(`Could not find the ${name} executable.`);
-    const npmBin = (_a = (0, cross_spawn_1.sync)("npm", ["bin"], { cwd }).stdout) === null || _a === void 0 ? void 0 : _a.toString().trim();
-    if (!npmBin) {
+    const npmRoot = (_a = (0, cross_spawn_1.sync)("npm", ["root"], { cwd }).stdout) === null || _a === void 0 ? void 0 : _a.toString().trim();
+    if (!npmRoot) {
         throw cantFindExecutable;
     }
-    const path = (0, path_1.join)(npmBin, name);
+    const path = (0, path_1.join)(npmRoot, ".bin", name);
     if (!(0, fsutils_1.fileExistsSync)(path)) {
         throw cantFindExecutable;
     }

package/lib/functions/secrets.js

@@ -12,13 +12,13 @@ const env_1 = require("./env");
 const logger_1 = require("../logger");
 const api_1 = require("../api");
 const functional_1 = require("../functional");
-const FIREBASE_MANGED = "firebase-managed";
+const FIREBASE_MANAGED = "firebase-managed";
 function isFirebaseManaged(secret) {
-    return Object.keys(secret.labels || []).includes(FIREBASE_MANGED);
+    return Object.keys(secret.labels || []).includes(FIREBASE_MANAGED);
 }
 exports.isFirebaseManaged = isFirebaseManaged;
 function labels() {
-    return { [FIREBASE_MANGED]: "true" };
+    return { [FIREBASE_MANAGED]: "true" };
 }
 exports.labels = labels;
 function toUpperSnakeCase(key) {
@@ -107,7 +107,7 @@ async function pruneSecrets(projectInfo, endpoints) {
     const { projectId, projectNumber } = projectInfo;
     const pruneKey = (name, version) => `${name}@${version}`;
     const prunedSecrets = new Set();
-    const haveSecrets = await (0, secretManager_1.listSecrets)(projectId, `labels.${FIREBASE_MANGED}=true`);
+    const haveSecrets = await (0, secretManager_1.listSecrets)(projectId, `labels.${FIREBASE_MANAGED}=true`);
     for (const secret of haveSecrets) {
         const versions = await (0, secretManager_1.listSecretVersions)(projectId, secret.name, `NOT state: DESTROYED`);
         for (const version of versions) {

package/lib/gcp/eventarc.js

@@ -12,7 +12,7 @@ const client = new apiv2_1.Client({
     apiVersion: exports.API_VERSION,
 });
 async function getChannel(name) {
-    const res = await client.get(name);
+    const res = await client.get(name, { resolveOnHTTPError: true });
     if (res.status === 404) {
         return undefined;
     }

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "firebase-tools",
-  "version": "11.28.0",
+  "version": "11.29.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "firebase-tools",
-      "version": "11.28.0",
+      "version": "11.29.0",
       "license": "MIT",
       "dependencies": {
         "@google-cloud/pubsub": "^3.0.1",

package/package.json

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