firebase-tools 15.28.3-feat-firebase-debug-path.0 → 15.30.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -54,36 +54,36 @@
54
54
  },
55
55
  "dataconnect": {
56
56
  "darwin": {
57
- "version": "3.4.18",
58
- "expectedSize": 33375408,
59
- "expectedChecksum": "e38f131497fc43df55c3a47ee87e7fd4",
60
- "expectedChecksumSHA256": "52518fefdd2e52581b0d8d035c6498f304ac493d3757f4fd35851b1f028a9460",
61
- "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-macos-amd64-v3.4.18",
62
- "downloadPathRelativeToCacheDir": "dataconnect-emulator-3.4.18"
57
+ "version": "3.4.19",
58
+ "expectedSize": 33412928,
59
+ "expectedChecksum": "5a65cd626d5c022eab4c2036b18f0314",
60
+ "expectedChecksumSHA256": "4a63243e720d26de7e2e5bd5060fc92768f09446ec42b3369fb6ddc06a9cdddf",
61
+ "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-macos-amd64-v3.4.19",
62
+ "downloadPathRelativeToCacheDir": "dataconnect-emulator-3.4.19"
63
63
  },
64
64
  "darwin_arm64": {
65
- "version": "3.4.18",
66
- "expectedSize": 31505922,
67
- "expectedChecksum": "6a7cfdd68a7671bb660eb8489372a890",
68
- "expectedChecksumSHA256": "96cdec1fd6561af5c10f915f6f3bfd59a7405bf5e9b8fabfedb40cd57d6d5d76",
69
- "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-macos-arm64-v3.4.18",
70
- "downloadPathRelativeToCacheDir": "dataconnect-emulator-3.4.18"
65
+ "version": "3.4.19",
66
+ "expectedSize": 31539602,
67
+ "expectedChecksum": "cd914718f705a9e614bc3024f443bb52",
68
+ "expectedChecksumSHA256": "dafb2e532c29d876cb30d5c2bf32b2e50a614386dc16ba82b0ed6a9fca2a6db3",
69
+ "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-macos-arm64-v3.4.19",
70
+ "downloadPathRelativeToCacheDir": "dataconnect-emulator-3.4.19"
71
71
  },
72
72
  "win32": {
73
- "version": "3.4.18",
74
- "expectedSize": 33414144,
75
- "expectedChecksum": "d2504c643ac8355b90aa31be7575807c",
76
- "expectedChecksumSHA256": "a92f2d01950af613d28b92c2cd7baa85e7629fa201b8ff8dddce73d5584dccc5",
77
- "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-windows-amd64-v3.4.18",
78
- "downloadPathRelativeToCacheDir": "dataconnect-emulator-3.4.18.exe"
73
+ "version": "3.4.19",
74
+ "expectedSize": 33444864,
75
+ "expectedChecksum": "e2f84df8d6c536bea29d2ccc4cb21e79",
76
+ "expectedChecksumSHA256": "756e370334ef982547e7252b3f91fd75b35f85c5d3666e8f3773a4a19a00c8f8",
77
+ "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-windows-amd64-v3.4.19",
78
+ "downloadPathRelativeToCacheDir": "dataconnect-emulator-3.4.19.exe"
79
79
  },
80
80
  "linux": {
81
- "version": "3.4.18",
82
- "expectedSize": 32510136,
83
- "expectedChecksum": "c8b4640f3ea59c813a708814bd2c0f8c",
84
- "expectedChecksumSHA256": "bb381de594485653812bee518ddae025c13e1050670d6fa186f6003c3c9b71ec",
85
- "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-linux-amd64-v3.4.18",
86
- "downloadPathRelativeToCacheDir": "dataconnect-emulator-3.4.18"
81
+ "version": "3.4.19",
82
+ "expectedSize": 32542904,
83
+ "expectedChecksum": "63f099c9b9dad6e7d2adddae8af884a3",
84
+ "expectedChecksumSHA256": "bc74b68cc4bafcccc57dbe659a74b4403c225f01f851b5a4a61dcea81e8b1310",
85
+ "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-linux-amd64-v3.4.19",
86
+ "downloadPathRelativeToCacheDir": "dataconnect-emulator-3.4.19"
87
87
  }
88
88
  }
89
89
  }
@@ -116,8 +116,8 @@ class TasksEmulator {
116
116
  const queueName = req.params.queue_name;
117
117
  if (!this.validateQueueId(queueName)) {
118
118
  res.status(400).json({
119
- error: "Queue ID must start with a letter followed by up to 62 letters, numbers, " +
120
- "hyphens, or underscores and must end with a letter or a number",
119
+ error: "Queue ID can contain only letters ([A-Za-z]), numbers ([0-9]), or hyphens (-). Queue ID " +
120
+ "must be between 1 and 100 characters.",
121
121
  });
122
122
  return;
123
123
  }
@@ -104,7 +104,7 @@ function functionsEnvFromInstance(instance) {
104
104
  if (renamed === "EXT_MIGRATED_SYSTEM_LOCATION") {
105
105
  renamed = "FUNCTION_DEFAULT_REGION";
106
106
  }
107
- envs[renamed] = specSystemParam.default ?? "";
107
+ envs[renamed] = String(specSystemParam.default ?? "");
108
108
  }
109
109
  }
110
110
  if (typeof instance.config.allowedEventTypes !== "undefined") {
@@ -162,8 +162,7 @@ async function substituteSecretParams(projectNumber, params) {
162
162
  const newParams = {};
163
163
  for await (const [key, value] of Object.entries(params)) {
164
164
  if (typeof value !== "string") {
165
- newParams[key] =
166
- `projects/${projectNumber}/secrets/${value.name}/versions/latest`;
165
+ newParams[key] = `projects/${projectNumber}/secrets/${value.name}/versions/latest`;
167
166
  }
168
167
  else {
169
168
  newParams[key] = value;
@@ -21,6 +21,7 @@ const prompt_1 = require("../prompt");
21
21
  const paramHelper_1 = require("./paramHelper");
22
22
  const error_1 = require("../error");
23
23
  const extensionsHelper_1 = require("./extensionsHelper");
24
+ const utils_1 = require("../utils");
24
25
  const types_1 = require("./types");
25
26
  exports.ENV_DIRECTORY = "extensions";
26
27
  async function writeToManifest(specs, config, options, allowOverwrite = false) {
@@ -99,16 +100,16 @@ function removeFromManifest(instanceId, config) {
99
100
  extensions[instanceId] = undefined;
100
101
  config.set("extensions", extensions);
101
102
  config.writeProjectFile("firebase.json", config.src);
102
- logger_1.logger.info(`Removed extension instance ${instanceId} from firebase.json`);
103
+ (0, utils_1.logLabeledBullet)(extensionsHelper_1.logPrefix, `Removed extension instance ${instanceId} from firebase.json`);
103
104
  config.deleteProjectFile(`extensions/${instanceId}.env`);
104
- logger_1.logger.info(`Removed extension instance environment config extensions/${instanceId}.env`);
105
+ (0, utils_1.logLabeledBullet)(extensionsHelper_1.logPrefix, `Removed extension instance environment config extensions/${instanceId}.env`);
105
106
  if (config.projectFileExists(`extensions/${instanceId}.env.local`)) {
106
107
  config.deleteProjectFile(`extensions/${instanceId}.env.local`);
107
- logger_1.logger.info(`Removed extension instance local environment config extensions/${instanceId}.env.local`);
108
+ (0, utils_1.logLabeledBullet)(extensionsHelper_1.logPrefix, `Removed extension instance local environment config extensions/${instanceId}.env.local`);
108
109
  }
109
110
  if (config.projectFileExists(`extensions/${instanceId}.secret.local`)) {
110
111
  config.deleteProjectFile(`extensions/${instanceId}.secret.local`);
111
- logger_1.logger.info(`Removed extension instance local secret config extensions/${instanceId}.secret.local`);
112
+ (0, utils_1.logLabeledBullet)(extensionsHelper_1.logPrefix, `Removed extension instance local secret config extensions/${instanceId}.secret.local`);
112
113
  }
113
114
  }
114
115
  function loadConfig(options) {
@@ -8,6 +8,8 @@ exports.getMigratableInstances = getMigratableInstances;
8
8
  exports.promptInstanceSelection = promptInstanceSelection;
9
9
  exports.createMigrationPlan = createMigrationPlan;
10
10
  exports.ensureInstanceUpToDate = ensureInstanceUpToDate;
11
+ exports.migrateSecrets = migrateSecrets;
12
+ exports.uninstallExtension = uninstallExtension;
11
13
  const clc = require("colorette");
12
14
  const Table = require("cli-table3");
13
15
  const error_1 = require("../error");
@@ -20,6 +22,8 @@ const refs = require("./refs");
20
22
  const paramHelper = require("./paramHelper");
21
23
  const updateHelper = require("./updateHelper");
22
24
  const replacements = require("./replacements.json");
25
+ const export_1 = require("./export");
26
+ const manifest = require("./manifest");
23
27
  function getKitPackage(extensionRef, packageOverride) {
24
28
  if (packageOverride) {
25
29
  return packageOverride;
@@ -288,3 +292,54 @@ async function ensureInstanceUpToDate(projectId, instance, options) {
288
292
  const updatedInstance = await extensionsApi.getInstance(projectId, instanceId);
289
293
  return updatedInstance ?? instance;
290
294
  }
295
+ async function migrateSecrets(instance, options) {
296
+ const secrets = await (0, export_1.secretsNeedingEjection)(instance);
297
+ if (secrets.length === 0) {
298
+ return [];
299
+ }
300
+ const instanceId = getInstanceId(instance);
301
+ (0, utils_1.logLabeledBullet)(extensionsHelper_1.logPrefix, `Transferring secrets for instance ${clc.bold(instanceId)} to Functions management...`);
302
+ const results = await (0, export_1.ejectSecretsFromInstance)(instance);
303
+ if (results.success.length > 0) {
304
+ (0, utils_1.logLabeledSuccess)(extensionsHelper_1.logPrefix, `Successfully transferred secrets to Functions management: ${results.success.join(", ")}`);
305
+ }
306
+ if (results.fail.length > 0) {
307
+ const resultMsg = `${results.fail.length} secrets failed to update: ${results.fail.join(", ")}.`;
308
+ (0, utils_1.logLabeledError)("functions", resultMsg);
309
+ (0, utils_1.logLabeledError)("functions", "Ensure you have Secret Manager Admin (roles/secretmanager.admin) permissions to transfer secrets.");
310
+ if (!options?.force) {
311
+ throw new error_1.FirebaseError("Secret migration failed.", { exit: 1 });
312
+ }
313
+ (0, utils_1.logLabeledWarning)("functions", "Proceeding after secret migration failure in --force mode. Manually remove the 'firebase-extensions-managed' label from the secrets before running ext:uninstall, or risk permanent data loss.");
314
+ }
315
+ return results.success;
316
+ }
317
+ async function uninstallExtension(projectId, instanceId, options, skipConfirm = false) {
318
+ if (!skipConfirm &&
319
+ !(await (0, prompt_1.confirm)({
320
+ message: `About to delete Extensions instance ${projectId}/${instanceId}, its associated resources, and service account. Continue?`,
321
+ nonInteractive: options.nonInteractive,
322
+ force: options.force,
323
+ default: true,
324
+ }))) {
325
+ return;
326
+ }
327
+ let config;
328
+ try {
329
+ config = manifest.loadConfig(options);
330
+ }
331
+ catch {
332
+ (0, utils_1.logLabeledBullet)(extensionsHelper_1.logPrefix, "No firebase.json found. Proceeding to immediate extension instance teardown.");
333
+ }
334
+ if (config && manifest.instanceExists(instanceId, config)) {
335
+ manifest.removeFromManifest(instanceId, config);
336
+ }
337
+ (0, utils_1.logLabeledBullet)(extensionsHelper_1.logPrefix, `Uninstalling extension instance ${clc.bold(instanceId)}...`);
338
+ try {
339
+ await extensionsApi.deleteInstance(projectId, instanceId);
340
+ }
341
+ catch (err) {
342
+ throw new error_1.FirebaseError(`Error when attempting deletion: ${err instanceof Error ? err.message : String(err)}`, { original: err instanceof Error ? err : undefined });
343
+ }
344
+ (0, utils_1.logLabeledSuccess)(extensionsHelper_1.logPrefix, `Deleted Extensions instance ${projectId}/${instanceId}.`);
345
+ }
@@ -16,6 +16,8 @@ exports.promptExistingInstanceForProject = promptExistingInstanceForProject;
16
16
  exports.writeKitPackageJson = writeKitPackageJson;
17
17
  exports.writeKitIndexTs = writeKitIndexTs;
18
18
  exports.scaffoldKitFiles = scaffoldKitFiles;
19
+ exports.resolveSdkSpecifierToSave = resolveSdkSpecifierToSave;
20
+ exports.getKitPackagesToSave = getKitPackagesToSave;
19
21
  exports.buildAndInstallKit = buildAndInstallKit;
20
22
  exports.addKitToConfig = addKitToConfig;
21
23
  exports.validateAndResolveDirectoryKit = validateAndResolveDirectoryKit;
@@ -36,6 +38,7 @@ const crypto = require("crypto");
36
38
  const path = require("path");
37
39
  const clc = require("colorette");
38
40
  const fs = require("fs-extra");
41
+ const semver = require("semver");
39
42
  const error_1 = require("../../error");
40
43
  const projectUtils_1 = require("../../projectUtils");
41
44
  const utils_1 = require("../../utils");
@@ -305,13 +308,15 @@ async function writeKitPackageJson(config, sourcePath, kitId) {
305
308
  }
306
309
  else {
307
310
  const latestNodeVersion = supported.latest("nodejs").replace("nodejs", "");
308
- const packageNoLintingTemplate = (0, templates_1.readTemplateSync)("init/functions/typescript/package.nolint.json");
309
- const subbedTemplate = packageNoLintingTemplate.replace(/{{RUNTIME}}/g, latestNodeVersion);
311
+ const packageKitTemplate = (0, templates_1.readTemplateSync)("init/functions/typescript/package-kit.json");
312
+ const subbedTemplate = packageKitTemplate.replace(/{{RUNTIME}}/g, latestNodeVersion);
310
313
  try {
311
314
  pkgJson = JSON.parse(subbedTemplate);
312
315
  }
313
316
  catch (err) {
314
- throw new error_1.FirebaseError("Failed to parse package.nolint.json template: " + (0, error_1.getErrMsg)(err));
317
+ throw new error_1.FirebaseError("Failed to parse package-kit.json template: " + (0, error_1.getErrMsg)(err), {
318
+ original: err instanceof Error ? err : undefined,
319
+ });
315
320
  }
316
321
  }
317
322
  pkgJson.name = `${kitId}-wrapper`;
@@ -339,7 +344,67 @@ async function scaffoldKitFiles(config, kitId, instanceId, packageName, template
339
344
  await writeKitIndexTs(config, sourcePath, packageName, templateType);
340
345
  return { sourcePath, configDirPath, absSourcePath, absConfigDirPath };
341
346
  }
347
+ function resolveSdkSpecifierToSave(packageName, declaredVer, installedVer) {
348
+ const cleanVer = semver.clean(declaredVer);
349
+ if (cleanVer) {
350
+ return `${packageName}@=${installedVer || cleanVer}`;
351
+ }
352
+ if (declaredVer.trim().startsWith("~")) {
353
+ return installedVer ? `${packageName}@~${installedVer}` : `${packageName}@${declaredVer}`;
354
+ }
355
+ if (installedVer) {
356
+ return `${packageName}@^${installedVer}`;
357
+ }
358
+ return `${packageName}@${declaredVer}`;
359
+ }
360
+ async function getKitPackagesToSave(absSourcePath, packageName) {
361
+ const lockfilePath = path.join(absSourcePath, "package-lock.json");
362
+ let peerDeps = {};
363
+ let directDeps = {};
364
+ let installedFunctionsVer;
365
+ let installedAdminVer;
366
+ if (await fs.pathExists(lockfilePath)) {
367
+ try {
368
+ const lockfile = (await fs.readJson(lockfilePath));
369
+ const packages = lockfile.packages || {};
370
+ const kitEntry = packages[`node_modules/${packageName}`] || {};
371
+ peerDeps = kitEntry.peerDependencies || {};
372
+ directDeps = kitEntry.dependencies || {};
373
+ installedFunctionsVer = packages["node_modules/firebase-functions"]?.version;
374
+ installedAdminVer = packages["node_modules/firebase-admin"]?.version;
375
+ }
376
+ catch (err) {
377
+ logger_1.logger.debug(`Failed to read package-lock.json: ${(0, error_1.getErrMsg)(err)}`);
378
+ }
379
+ }
380
+ if (Object.keys(peerDeps).length === 0 && Object.keys(directDeps).length === 0) {
381
+ const kitPkgJsonPath = path.join(absSourcePath, "node_modules", packageName, "package.json");
382
+ if (await fs.pathExists(kitPkgJsonPath)) {
383
+ try {
384
+ const kitPkgJson = (await fs.readJson(kitPkgJsonPath));
385
+ peerDeps = kitPkgJson.peerDependencies || {};
386
+ directDeps = kitPkgJson.dependencies || {};
387
+ }
388
+ catch (err) {
389
+ logger_1.logger.debug(`Failed to read kit package.json: ${(0, error_1.getErrMsg)(err)}`);
390
+ }
391
+ }
392
+ }
393
+ const declaredFunctionsVer = peerDeps["firebase-functions"] || directDeps["firebase-functions"];
394
+ if (!declaredFunctionsVer) {
395
+ throw new error_1.FirebaseError(`Package '${packageName}' is not a valid Function Kit: it must declare 'firebase-functions' as a dependency or peer dependency.`);
396
+ }
397
+ const packagesToSave = [
398
+ resolveSdkSpecifierToSave("firebase-functions", declaredFunctionsVer, installedFunctionsVer),
399
+ ];
400
+ const declaredAdminVer = peerDeps["firebase-admin"] || directDeps["firebase-admin"];
401
+ if (declaredAdminVer) {
402
+ packagesToSave.push(resolveSdkSpecifierToSave("firebase-admin", declaredAdminVer, installedAdminVer));
403
+ }
404
+ return packagesToSave;
405
+ }
342
406
  async function buildAndInstallKit(absSourcePath, rawPkgName, isThirdParty) {
407
+ const { packageName } = parseNpmPackageSpecifier(rawPkgName);
343
408
  const installArgs = ["install", rawPkgName, "--save-prefix=^"];
344
409
  if (isThirdParty) {
345
410
  installArgs.push("--ignore-scripts");
@@ -351,6 +416,21 @@ async function buildAndInstallKit(absSourcePath, rawPkgName, isThirdParty) {
351
416
  catch (err) {
352
417
  throw new error_1.FirebaseError(`NPM install failed: ${(0, error_1.getErrMsg)(err)}`);
353
418
  }
419
+ const packagesToSave = await getKitPackagesToSave(absSourcePath, packageName);
420
+ if (packagesToSave.length > 0) {
421
+ (0, utils_1.logLabeledBullet)("functions", `Saving resolved SDK dependencies: ${clc.bold(packagesToSave.join(", "))}...`);
422
+ const saveArgs = ["install", ...packagesToSave, "--save-prefix=^"];
423
+ if (isThirdParty) {
424
+ saveArgs.push("--ignore-scripts");
425
+ }
426
+ try {
427
+ await (0, spawn_1.wrapSpawn)("npm", saveArgs, absSourcePath);
428
+ }
429
+ catch (err) {
430
+ throw new error_1.FirebaseError(`Failed to install required SDK dependencies (${packagesToSave.join(", ")}): ${(0, error_1.getErrMsg)(err)}. ` +
431
+ "Verify that the kit's dependencies are compatible with the resolved Firebase SDK versions.", { original: err instanceof Error ? err : undefined });
432
+ }
433
+ }
354
434
  (0, utils_1.logLabeledBullet)("functions", "Building TypeScript source...");
355
435
  try {
356
436
  await (0, spawn_1.wrapSpawn)("npm", ["run", "build"], absSourcePath);
@@ -605,7 +685,9 @@ async function addKitInstanceOrConfigureProject(options, existingKit, existingFu
605
685
  const unconfiguredInstances = getUnconfiguredInstancesForProject(options.config, existingKit, projectId, projectAlias);
606
686
  const isConfiguredForProject = Object.keys(existingKit.instances || {}).length > 0 && unconfiguredInstances.length === 0;
607
687
  let action;
608
- if (options.instanceId && existingKit.instances && options.instanceId in existingKit.instances) {
688
+ if (options.instanceId &&
689
+ existingKit.instances &&
690
+ Object.prototype.hasOwnProperty.call(existingKit.instances, options.instanceId)) {
609
691
  if (!unconfiguredInstances.includes(options.instanceId)) {
610
692
  throw new error_1.FirebaseError(`Instance '${options.instanceId}' is already configured for this project.`);
611
693
  }
@@ -642,7 +724,7 @@ async function addKitInstanceOrConfigureProject(options, existingKit, existingFu
642
724
  let absConfigDirPath;
643
725
  if (action === "addInstance") {
644
726
  resultAction = "addedInstance";
645
- instanceId = await promptKitInstanceId(existingKit.kit, existingFunctionsInfo.existingInstanceIds, existingFunctionsInfo.existingCodebases, options.nonInteractive, options.instanceId);
727
+ instanceId = await promptKitInstanceId(options.defaultInstanceId ?? existingKit.kit, existingFunctionsInfo.existingInstanceIds, existingFunctionsInfo.existingCodebases, options.nonInteractive, options.instanceId);
646
728
  const result = await addInstanceToKit({
647
729
  config: options.config,
648
730
  kitId: existingKit.kit,
@@ -659,7 +741,7 @@ async function addKitInstanceOrConfigureProject(options, existingKit, existingFu
659
741
  existingKit,
660
742
  unconfiguredInstanceIds: unconfiguredInstances,
661
743
  });
662
- configDirPath = existingKit.instances[instanceId];
744
+ configDirPath = existingKit.instances?.[instanceId];
663
745
  if (!configDirPath) {
664
746
  throw new error_1.FirebaseError(`Configuration directory for instance '${instanceId}' not found in kit '${existingKit.kit}'.`);
665
747
  }
@@ -809,7 +891,7 @@ async function installKitOrInstance(options) {
809
891
  ? await resolveDirectorySource(options)
810
892
  : await resolvePackageSource(options);
811
893
  const kitId = await promptKitId(source.defaultKitName, existingFunctionsInfo.existingKitIds, options.nonInteractive, options.kitId);
812
- const instanceId = await promptKitInstanceId(kitId, existingFunctionsInfo.existingInstanceIds, existingFunctionsInfo.existingCodebases, options.nonInteractive, options.instanceId);
894
+ const instanceId = await promptKitInstanceId(options.defaultInstanceId ?? kitId, existingFunctionsInfo.existingInstanceIds, existingFunctionsInfo.existingCodebases, options.nonInteractive, options.instanceId);
813
895
  const { sourcePath, configDirPath, absSourcePath, absConfigDirPath } = await source.setup(kitId, instanceId);
814
896
  if (options.seedEnv?.envs && Object.keys(options.seedEnv.envs).length > 0) {
815
897
  (0, env_2.seedKitInstanceEnv)({
@@ -7,9 +7,10 @@ exports.addServiceAccountToRoles = addServiceAccountToRoles;
7
7
  exports.serviceAccountHasRoles = serviceAccountHasRoles;
8
8
  exports.removeServiceAccountRoles = removeServiceAccountRoles;
9
9
  exports.getServiceAccountRoles = getServiceAccountRoles;
10
- const lodash_1 = require("lodash");
11
10
  const api_1 = require("../api");
12
11
  const apiv2_1 = require("../apiv2");
12
+ const error_1 = require("../error");
13
+ const utils = require("../utils");
13
14
  const iam_1 = require("./iam");
14
15
  const API_VERSION = "v1";
15
16
  const apiClient = new apiv2_1.Client({ urlPrefix: (0, api_1.resourceManagerOrigin)(), apiVersion: API_VERSION });
@@ -32,30 +33,38 @@ async function setIamPolicy(projectIdOrNumber, newPolicy, updateMask = "") {
32
33
  });
33
34
  return response.body;
34
35
  }
36
+ function isRetryableIamError(err) {
37
+ const status = (0, error_1.getErrStatus)(err);
38
+ if (status === 409) {
39
+ return true;
40
+ }
41
+ const msg = (0, error_1.getErrMsg)(err).toLowerCase();
42
+ const hasSa = msg.includes("service account") || msg.includes("serviceaccount");
43
+ if (status === 400 && hasSa && msg.includes("does not exist")) {
44
+ return true;
45
+ }
46
+ return false;
47
+ }
35
48
  async function addServiceAccountToRoles(projectId, serviceAccountName, roles, skipAccountLookup = false) {
36
- const [{ name: fullServiceAccountName }, projectPolicy] = await Promise.all([
37
- skipAccountLookup
38
- ? Promise.resolve({ name: serviceAccountName })
39
- : (0, iam_1.getServiceAccount)(projectId, serviceAccountName),
40
- getIamPolicy(projectId),
41
- ]);
42
- projectPolicy.bindings = projectPolicy.bindings || [];
49
+ const { name: fullServiceAccountName } = skipAccountLookup
50
+ ? { name: serviceAccountName }
51
+ : await (0, iam_1.getServiceAccount)(projectId, serviceAccountName);
43
52
  const newMemberName = `serviceAccount:${fullServiceAccountName.split("/").pop()}`;
44
- roles.forEach((roleName) => {
45
- let bindingIndex = (0, lodash_1.findIndex)(projectPolicy.bindings, (binding) => binding.role === roleName);
46
- if (bindingIndex === -1) {
47
- bindingIndex =
48
- projectPolicy.bindings.push({
49
- role: roleName,
50
- members: [],
51
- }) - 1;
52
- }
53
- const binding = projectPolicy.bindings[bindingIndex];
54
- if (!binding.members.includes(newMemberName)) {
55
- binding.members.push(newMemberName);
56
- }
53
+ return await utils.retryWithBackoff(async () => {
54
+ const projectPolicy = await getIamPolicy(projectId);
55
+ projectPolicy.bindings = projectPolicy.bindings || [];
56
+ const requiredBindings = roles.map((role) => ({
57
+ role,
58
+ members: [newMemberName],
59
+ }));
60
+ (0, iam_1.mergeBindings)(projectPolicy, requiredBindings);
61
+ return await setIamPolicy(projectId, projectPolicy, "bindings");
62
+ }, {
63
+ retries: 6,
64
+ delay: 1000,
65
+ maxDelay: 5000,
66
+ retryPredicate: isRetryableIamError,
57
67
  });
58
- return setIamPolicy(projectId, projectPolicy, "bindings");
59
68
  }
60
69
  async function serviceAccountHasRoles(projectId, serviceAccountName, roles, skipAccountLookup = false) {
61
70
  const [{ name: fullServiceAccountName }, projectPolicy] = await Promise.all([
package/lib/gcp/run.js CHANGED
@@ -15,7 +15,7 @@ const apiv2_1 = require("../apiv2");
15
15
  const error_1 = require("../error");
16
16
  const api_1 = require("../api");
17
17
  const proto = require("./proto");
18
- const throttler_1 = require("../throttler/throttler");
18
+ const utils_1 = require("../utils");
19
19
  const logger_1 = require("../logger");
20
20
  const cloudlogging_1 = require("./cloudlogging");
21
21
  const API_VERSION = "v1";
@@ -49,7 +49,7 @@ async function updateService(name, service) {
49
49
  service = await exports.replaceService(name, service);
50
50
  let retry = 0;
51
51
  while (!exports.serviceIsResolved(service)) {
52
- await (0, throttler_1.backoff)(retry, 2, 30);
52
+ await (0, utils_1.backoff)(retry, 2, 30);
53
53
  retry = retry + 1;
54
54
  service = await exports.getService(name);
55
55
  }
@@ -1,9 +1,28 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.ONEMCP_SERVERS = void 0;
4
+ exports.dataConnectLocationHeaderInjector = dataConnectLocationHeaderInjector;
4
5
  const api_1 = require("../../api");
5
6
  const onemcp_server_1 = require("./onemcp_server");
7
+ function dataConnectLocationHeaderInjector(headers, _toolName, args) {
8
+ if (typeof args?.location === "string" && args.location && !headers["Mcp-Param-Region"]) {
9
+ return { "Mcp-Param-Region": args.location };
10
+ }
11
+ }
6
12
  exports.ONEMCP_SERVERS = {
13
+ dataconnect: new onemcp_server_1.OneMcpServer("dataconnect", (0, api_1.dataconnectOrigin)(), {
14
+ requiresAuth: true,
15
+ }, {
16
+ allowedTools: [
17
+ "execute_graphql",
18
+ "execute_graphql_read",
19
+ "generate_schema",
20
+ "generate_query",
21
+ "generate_query_from_schema",
22
+ "list_locations",
23
+ ],
24
+ headerOverride: dataConnectLocationHeaderInjector,
25
+ }),
7
26
  developerknowledge: new onemcp_server_1.OneMcpServer("developerknowledge", (0, api_1.developerKnowledgeOrigin)(), {
8
27
  requiresAuth: true,
9
28
  }, {
@@ -88,6 +88,17 @@ class OneMcpServer {
88
88
  await (0, ensureApiEnabled_1.ensure)(ctx.projectId, this.serverUrl, this.feature, true);
89
89
  }
90
90
  try {
91
+ const baseHeaders = {
92
+ "MCP-Protocol-Version": types_js_1.LATEST_PROTOCOL_VERSION,
93
+ "Mcp-Method": "tools/call",
94
+ "Mcp-Name": toolName,
95
+ ...(ctx.projectId ? { "x-goog-user-project": ctx.projectId } : {}),
96
+ ...paramHeaders,
97
+ };
98
+ const headers = {
99
+ ...baseHeaders,
100
+ ...(this.options.headerOverride?.(baseHeaders, toolName, args) ?? {}),
101
+ };
91
102
  const res = await this.callClient.post("/mcp", {
92
103
  method: "tools/call",
93
104
  params: {
@@ -97,13 +108,7 @@ class OneMcpServer {
97
108
  jsonrpc: "2.0",
98
109
  id: 1,
99
110
  }, {
100
- headers: {
101
- "MCP-Protocol-Version": types_js_1.LATEST_PROTOCOL_VERSION,
102
- "Mcp-Method": "tools/call",
103
- "Mcp-Name": toolName,
104
- ...(ctx.projectId ? { "x-goog-user-project": ctx.projectId } : {}),
105
- ...paramHeaders,
106
- },
111
+ headers,
107
112
  });
108
113
  return types_js_1.CallToolResultSchema.parse(res.body.result);
109
114
  }
@@ -1,19 +1,43 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.execute = void 0;
3
+ exports.execute_in_emulator = void 0;
4
4
  const zod_1 = require("zod");
5
5
  const tool_1 = require("../../tool");
6
6
  const dataplane = require("../../../dataconnect/dataplaneClient");
7
7
  const load_1 = require("../../../dataconnect/load");
8
8
  const converter_1 = require("../../util/dataconnect/converter");
9
9
  const emulator_1 = require("../../util/dataconnect/emulator");
10
- exports.execute = (0, tool_1.tool)("dataconnect", {
11
- name: "execute",
12
- description: "Use this to execute a GraphQL operation against a SQL Connect service or its emulator.",
10
+ exports.execute_in_emulator = (0, tool_1.tool)("dataconnect", {
11
+ name: "execute_in_emulator",
12
+ description: `Executes a GraphQL operation against a local Firebase SQL Connect Service instance emulator.
13
+
14
+ Grants access to run queries and mutations on the local emulator.
15
+
16
+ **Prerequisites:**
17
+ * The Firebase local emulators must be running (run \`firebase emulators:start\` in your project directory).
18
+ * A \`firebase.json\` file configured with a \`dataconnect\` service.
19
+ * A \`dataconnect.yaml\` configuration file inside the service's source directory.
20
+ * A defined SQL Connect schema (configured via the schema/schemas fields in \`dataconnect.yaml\`).
21
+ * Note: These files are ideally generated using the \`firebase_init\` MCP tool, or must follow the standard structure described in the \`firebase-data-connect-basics\` skill.
22
+
23
+ **When to use it:**
24
+ * Use this tool to execute local GraphQL queries or mutations for development and testing.
25
+
26
+ **How to use it:**
27
+ * Call \`execute_in_emulator\` with the GraphQL \`query\` string.
28
+ * Optionally provide \`service_id\`, \`location_id\`, \`variables_json\`, and \`auth_token_json\`.
29
+
30
+ **JSON Example:**
31
+ \`\`\`json
32
+ {
33
+ "query": "query GetUser($id: UUID!) { user(id: $id) { name } }",
34
+ "variables_json": "{\\"id\\": \\"123e4567-e89b-12d3-a456-426614174000\\"}"
35
+ }
36
+ \`\`\`
37
+ `,
13
38
  humanReadableDescription: "Execute a GraphQL query or mutation against a Firebase SQL Connect service or emulator.",
14
39
  inputSchema: zod_1.z.object({
15
40
  query: zod_1.z.string().describe(`A Firebase SQL Connect GraphQL query or mutation to execute.
16
- You can use the \`dataconnect_generate_operation\` tool to generate a query.
17
41
  Example SQL Connect schema and example queries can be found in files ending in \`.graphql\` or \`.gql\`.
18
42
  `),
19
43
  service_id: zod_1.z
@@ -34,27 +58,17 @@ Example SQL Connect schema and example queries can be found in files ending in \
34
58
  .describe("Firebase Auth Token JWT to use in this query. MUST be a valid stringified JSON object." +
35
59
  'Importantly, when executing queries with `@auth(level: USER)` or `auth.uid`, a valid Firebase Auth Token JWT with "sub" field is required. ' +
36
60
  '"auth.uid" expression in the query evaluates to the value of "sub" field in Firebase Auth token.'),
37
- use_emulator: zod_1.z
38
- .boolean()
39
- .default(false)
40
- .describe("If true, target the DataConnect emulator. Run `firebase emulators:start` to start it"),
41
61
  }),
42
62
  annotations: {
43
- title: "Execute Firebase SQL Connect Query",
63
+ title: "Execute Firebase SQL Connect Query in Emulator",
44
64
  },
45
65
  _meta: {
46
66
  requiresProject: true,
47
- requiresAuth: true,
67
+ requiresAuth: false,
48
68
  },
49
- }, async ({ query, service_id, location_id, variables_json: unparsedVariables, use_emulator, auth_token_json: unparsedAuthToken, }, { projectId, config, host }) => {
69
+ }, async ({ query, service_id, location_id, variables_json: unparsedVariables, auth_token_json: unparsedAuthToken, }, { projectId, config, host }) => {
50
70
  const serviceInfo = await (0, load_1.pickOneService)(projectId, config, service_id || undefined, location_id || undefined);
51
- let apiClient;
52
- if (use_emulator) {
53
- apiClient = await (0, emulator_1.getDataConnectEmulatorClient)(host);
54
- }
55
- else {
56
- apiClient = dataplane.dataconnectDataplaneClient();
57
- }
71
+ const apiClient = await (0, emulator_1.getDataConnectEmulatorClient)(host);
58
72
  let executeGraphQL = dataplane.executeGraphQL;
59
73
  if (query.startsWith("query")) {
60
74
  executeGraphQL = dataplane.executeGraphQLRead;
@@ -4,4 +4,4 @@ exports.dataconnectTools = void 0;
4
4
  const list_services_1 = require("./list_services");
5
5
  const compile_1 = require("./compile");
6
6
  const execute_1 = require("./execute");
7
- exports.dataconnectTools = [compile_1.compile, list_services_1.list_services, execute_1.execute];
7
+ exports.dataconnectTools = [compile_1.compile, list_services_1.list_services, execute_1.execute_in_emulator];
@@ -1,19 +1,10 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.Throttler = void 0;
4
- exports.backoff = backoff;
5
- exports.timeToWait = timeToWait;
6
4
  const logger_1 = require("../logger");
5
+ const utils_1 = require("../utils");
7
6
  const retries_exhausted_error_1 = require("./errors/retries-exhausted-error");
8
7
  const timeout_error_1 = require("./errors/timeout-error");
9
- function backoff(retryNumber, delay, maxDelay) {
10
- return new Promise((resolve) => {
11
- setTimeout(resolve, timeToWait(retryNumber, delay, maxDelay));
12
- });
13
- }
14
- function timeToWait(retryNumber, delay, maxDelay) {
15
- return Math.min(delay * Math.pow(2, retryNumber), maxDelay);
16
- }
17
8
  function DEFAULT_HANDLER(task) {
18
9
  return task();
19
10
  }
@@ -184,7 +175,7 @@ class Throttler {
184
175
  if (taskData.retryCount === this.retries) {
185
176
  throw new retries_exhausted_error_1.default(this.taskName(cursorIndex), this.retries, err);
186
177
  }
187
- await backoff(taskData.retryCount + 1, this.backoff, this.maxBackoff);
178
+ await (0, utils_1.backoff)(taskData.retryCount + 1, this.backoff, this.maxBackoff);
188
179
  if (taskData.isTimedOut) {
189
180
  throw new timeout_error_1.default(this.taskName(cursorIndex), taskData.timeoutMillis);
190
181
  }