@rockcarver/frodo-cli 3.0.6 → 3.0.7

package/CHANGELOG.md

@@ -7,6 +7,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Fixed
+
+- log fetch now repects the log API request limit (1 per second)
+- log fetch and log tail default to ALL levels by default
+
+## [3.0.6] - 2025-06-18
+
 ## [3.0.5] - 2025-04-07
 
 ### Fixed
@@ -2073,7 +2080,8 @@ Frodo CLI 2.x automatically refreshes session and access tokens before they expi
 - Fixed problem with adding connection profiles
 - Miscellaneous bug fixes
 
-[unreleased]: https://github.com/rockcarver/frodo-cli/compare/v3.0.5...HEAD
+[unreleased]: https://github.com/rockcarver/frodo-cli/compare/v3.0.6...HEAD
+[3.0.6]: https://github.com/rockcarver/frodo-cli/compare/v3.0.5...v3.0.6
 [3.0.5]: https://github.com/rockcarver/frodo-cli/compare/v3.0.4...v3.0.5
 [3.0.4]: https://github.com/rockcarver/frodo-cli/compare/v3.0.4-1...v3.0.4
 [3.0.4-1]: https://github.com/rockcarver/frodo-cli/compare/v3.0.4-0...v3.0.4-1

package/dist/app.cjs

@@ -106883,7 +106883,7 @@ function stringify(obj) {
 }
 var package_default = {
   name: "@rockcarver/frodo-lib",
-  version: "3.3.0",
+  version: "3.3.1",
   type: "commonjs",
   main: "./dist/index.js",
   module: "./dist/index.mjs",
@@ -124661,6 +124661,26 @@ function generateLogApi({
     requestOverride
   );
   const request = createAxiosInstance(state2, requestConfig);
+  request.interceptors.response.use(
+    (response) => {
+      return response;
+    },
+    async (error2) => {
+      const originalRequest = error2.config;
+      const status = error2.response ? error2.response.status : null;
+      if (status === 429 && error2.response.headers["retry-after"] && !originalRequest._retry) {
+        originalRequest._retry = true;
+        const retryAfterSeconds = parseInt(
+          error2.response.headers["retry-after"],
+          10
+        );
+        const delayMs = (retryAfterSeconds + 1) * 1e3;
+        await new Promise((resolve52) => setTimeout(resolve52, delayMs));
+        return request(originalRequest);
+      }
+      return Promise.reject(error2);
+    }
+  );
   if (state2.getCurlirize()) {
     curlirize(request, state2);
   }
@@ -143780,7 +143800,7 @@ async function getEsvCount2({
   }
 }
 var logsTailURLTemplate = "%s/monitoring/logs/tail?source=%s";
-var logsFetchURLTemplate = "%s/monitoring/logs?source=%s&beginTime=%s&endTime=%s";
+var logsFetchURLTemplate = "%s/monitoring/logs?source=%s";
 var logsSourcesURLTemplate = "%s/monitoring/logs/sources";
 var logsCreateAPIKeyAndSecretURLTemplate = "%s/keys?_action=create";
 var logsGetAPIKeysURLTemplate = "%s/keys";
@@ -143887,15 +143907,25 @@ async function fetch2({
   startTs,
   endTs,
   cookie,
+  txid,
+  filter: filter2,
   state: state2
 }) {
   let urlString = _util2.default.format(
     logsFetchURLTemplate,
     getHostOnlyUrl(state2.getHost()),
-    encodeURIComponent(source),
-    startTs,
-    endTs
+    encodeURIComponent(source)
   );
+  if (startTs && endTs) {
+    urlString += `&beginTime=${startTs}&endTime=${endTs}`;
+  }
+  if (txid) {
+    urlString += `&transactionId=${txid}`;
+  }
+  if (filter2) {
+    const filterParam = `_queryFilter=${filter2}`;
+    urlString += `&${encodeURIComponent(filterParam)}`;
+  }
   if (cookie) {
     urlString += `&_pagedResultsCookie=${encodeURIComponent(cookie)}`;
   }
@@ -143940,8 +143970,8 @@ var LogOps_default = (state2) => {
     tail(source, cookie) {
       return tail2({ source, cookie, state: state2 });
     },
-    async fetch(source, startTs, endTs, cookie) {
-      return fetch3({ source, startTs, endTs, cookie, state: state2 });
+    async fetch(source, startTs, endTs, cookie, txid, filter2) {
+      return fetch3({ source, startTs, endTs, cookie, txid, filter: filter2, state: state2 });
     }
   };
 };
@@ -144260,10 +144290,12 @@ async function fetch3({
   startTs,
   endTs,
   cookie,
+  txid,
+  filter: filter2,
   state: state2
 }) {
   try {
-    return fetch2({ source, startTs, endTs, cookie, state: state2 });
+    return fetch2({ source, startTs, endTs, cookie, txid, filter: filter2, state: state2 });
   } catch (error2) {
     throw new FrodoError(`Error fetching logs`, error2);
   }
@@ -169292,18 +169324,23 @@ async function tailLogs(source, levels, txid, cookie, nf) {
     printError2(error2);
   }
 }
-async function fetchLogs(source, startTs, endTs, levels, txid, ffString, cookie, nf) {
+async function fetchLogs(source, startTs, endTs, levels, txid, filter2, ffString, cookie, nf) {
   try {
-    const logsObject = await fetch4(source, startTs, endTs, cookie);
+    const logsObject = await fetch4(
+      source,
+      startTs,
+      endTs,
+      cookie,
+      txid,
+      filter2
+    );
     let filteredLogs = [];
     const noiseFilter = nf == null ? getDefaultNoiseFilter3() : nf;
     if (Array.isArray(logsObject.result)) {
       filteredLogs = logsObject.result.filter(
         (el) => !noiseFilter.includes(
           el.payload.logger
-        ) && !noiseFilter.includes(el.type) && (levels[0] === "ALL" || levels.includes(resolvePayloadLevel2(el))) && (typeof txid === "undefined" || txid === null || _optionalChain([el, 'access', _382 => _382.payload, 'access', _383 => _383.transactionId, 'optionalAccess', _384 => _384.includes, 'call', _385 => _385(
-          txid
-        )]))
+        ) && !noiseFilter.includes(el.type) && (levels[0] === "ALL" || levels.includes(resolvePayloadLevel2(el)))
       );
     }
     filteredLogs.forEach((e) => {
@@ -169317,12 +169354,14 @@ async function fetchLogs(source, startTs, endTs, levels, txid, ffString, cookie,
       }
     });
     if (logsObject.pagedResultsCookie != null) {
+      await new Promise((resolve7) => setTimeout(resolve7, 1e3));
       await fetchLogs(
         source,
         startTs,
         endTs,
         levels,
         txid,
+        filter2,
         ffString,
         logsObject.pagedResultsCookie,
         nf
@@ -169455,9 +169494,9 @@ function setup79() {
                 `Created log API key ${creds.api_key_id} and secret.`
               );
             } catch (error2) {
-              printMessage2(_optionalChain([error2, 'access', _386 => _386.response, 'optionalAccess', _387 => _387.data]), "error");
+              printMessage2(_optionalChain([error2, 'access', _382 => _382.response, 'optionalAccess', _383 => _383.data]), "error");
               printMessage2(
-                `Error creating log API key and secret: ${_optionalChain([error2, 'access', _388 => _388.response, 'optionalAccess', _389 => _389.data, 'optionalAccess', _390 => _390.message])}`,
+                `Error creating log API key and secret: ${_optionalChain([error2, 'access', _384 => _384.response, 'optionalAccess', _385 => _385.data, 'optionalAccess', _386 => _386.message])}`,
                 "error"
               );
               process.exitCode = 1;
@@ -170163,7 +170202,7 @@ function setup86() {
           printMessage2(updatesTable.toString(), "data");
         }
         if (!options.checkOnly) {
-          if (_optionalChain([updates, 'access', _391 => _391.secrets, 'optionalAccess', _392 => _392.length]) || _optionalChain([updates, 'access', _393 => _393.variables, 'optionalAccess', _394 => _394.length]) || options.force) {
+          if (_optionalChain([updates, 'access', _387 => _387.secrets, 'optionalAccess', _388 => _388.length]) || _optionalChain([updates, 'access', _389 => _389.variables, 'optionalAccess', _390 => _390.length]) || options.force) {
             const ok = options.yes || await (0, import_yesno.default)({
               question: `
 Changes may take up to 10 minutes to propagate, during which time you will not be able to make further updates.
@@ -173872,7 +173911,7 @@ function getNodeClassificationMd(nodeType) {
 function getOneLineDescription5(nodeObj, nodeRef) {
   const description = `[${nodeObj._id["brightCyan"]}] (${getNodeClassification2(
     nodeObj._type._id
-  ).join(", ")}) ${nodeObj._type._id}${nodeRef ? " - " + _optionalChain([nodeRef, 'optionalAccess', _395 => _395.displayName]) : ""}`;
+  ).join(", ")}) ${nodeObj._type._id}${nodeRef ? " - " + _optionalChain([nodeRef, 'optionalAccess', _391 => _391.displayName]) : ""}`;
   return description;
 }
 function getTableHeaderMd5() {
@@ -174608,7 +174647,7 @@ async function listJourneys(long = false, analyze = false) {
           table.push([
             `${journeyStub._id}`,
             journeyStub.enabled === false ? "disabled"["brightRed"] : "enabled"["brightGreen"],
-            _optionalChain([journeyStub, 'access', _396 => _396.uiConfig, 'optionalAccess', _397 => _397.categories]) ? wordwrap(
+            _optionalChain([journeyStub, 'access', _392 => _392.uiConfig, 'optionalAccess', _393 => _393.categories]) ? wordwrap(
               JSON.parse(journeyStub.uiConfig.categories).join(", "),
               60
             ) : ""
@@ -174650,7 +174689,7 @@ async function listJourneys(long = false, analyze = false) {
               `${journeyExport.tree._id}`,
               journeyExport.tree.enabled === false ? "disabled"["brightRed"] : "enabled"["brightGreen"],
               getJourneyClassification2(journeyExport).join(", "),
-              _optionalChain([journeyExport, 'access', _398 => _398.tree, 'access', _399 => _399.uiConfig, 'optionalAccess', _400 => _400.categories]) ? wordwrap(
+              _optionalChain([journeyExport, 'access', _394 => _394.tree, 'access', _395 => _395.uiConfig, 'optionalAccess', _396 => _396.categories]) ? wordwrap(
                 JSON.parse(journeyExport.tree.uiConfig.categories).join(
                   ", "
                 ),
@@ -175062,7 +175101,7 @@ async function describeJourney(journeyData, resolveTreeExport = onlineTreeExport
         nodeTypeMap[nodeData._type._id] = 1;
       }
     }
-    if (!state.getAmVersion() && _optionalChain([journeyData, 'access', _401 => _401.meta, 'optionalAccess', _402 => _402.originAmVersion])) {
+    if (!state.getAmVersion() && _optionalChain([journeyData, 'access', _397 => _397.meta, 'optionalAccess', _398 => _398.originAmVersion])) {
       state.setAmVersion(journeyData.meta.originAmVersion);
     }
     printMessage2(`${getOneLineDescription8(journeyData.tree)}`, "data");
@@ -175086,7 +175125,7 @@ ${getJourneyClassification2(journeyData).join(", ")}`,
         "data"
       );
     }
-    if (_optionalChain([journeyData, 'access', _403 => _403.tree, 'access', _404 => _404.uiConfig, 'optionalAccess', _405 => _405.categories]) && journeyData.tree.uiConfig.categories != "[]") {
+    if (_optionalChain([journeyData, 'access', _399 => _399.tree, 'access', _400 => _400.uiConfig, 'optionalAccess', _401 => _401.categories]) && journeyData.tree.uiConfig.categories != "[]") {
       printMessage2("\nCategories/Tags", "data");
       printMessage2(
         `${JSON.parse(journeyData.tree.uiConfig.categories).join(", ")}`,
@@ -175128,7 +175167,7 @@ Nodes (${Object.entries(allNodes).length}):`, "data");
         );
       }
     }
-    if (_optionalChain([journeyData, 'access', _406 => _406.themes, 'optionalAccess', _407 => _407.length])) {
+    if (_optionalChain([journeyData, 'access', _402 => _402.themes, 'optionalAccess', _403 => _403.length])) {
       printMessage2(`
 Themes (${journeyData.themes.length}):`, "data");
       for (const themeData of journeyData.themes) {
@@ -175222,14 +175261,14 @@ async function describeJourneyMd(journeyData, resolveTreeExport = onlineTreeExpo
         nodeTypeMap[nodeData._type._id] = 1;
       }
     }
-    if (!state.getAmVersion() && _optionalChain([journeyData, 'access', _408 => _408.meta, 'optionalAccess', _409 => _409.originAmVersion])) {
+    if (!state.getAmVersion() && _optionalChain([journeyData, 'access', _404 => _404.meta, 'optionalAccess', _405 => _405.originAmVersion])) {
       state.setAmVersion(journeyData.meta.originAmVersion);
     }
     printMessage2(
       `# ${getOneLineDescriptionMd(journeyData.tree)} - ${journeyData.tree.enabled === false ? ":o: `disabled`" : ":white_check_mark: `enabled`"}, ${getJourneyClassificationMd(journeyData).join(", ")}`,
       "data"
     );
-    if (_optionalChain([journeyData, 'access', _410 => _410.tree, 'access', _411 => _411.uiConfig, 'optionalAccess', _412 => _412.categories]) && journeyData.tree.uiConfig.categories != "[]") {
+    if (_optionalChain([journeyData, 'access', _406 => _406.tree, 'access', _407 => _407.uiConfig, 'optionalAccess', _408 => _408.categories]) && journeyData.tree.uiConfig.categories != "[]") {
       printMessage2(
         `\`${JSON.parse(journeyData.tree.uiConfig.categories).join("`, `")}\``,
         "data"
@@ -175273,7 +175312,7 @@ ${journeyData.tree.description}`, "data");
         );
       }
     }
-    if (_optionalChain([journeyData, 'access', _413 => _413.themes, 'optionalAccess', _414 => _414.length])) {
+    if (_optionalChain([journeyData, 'access', _409 => _409.themes, 'optionalAccess', _410 => _410.length])) {
       printMessage2(`## Themes (${journeyData.themes.length})`, "data");
       printMessage2(getTableHeaderMd7(), "data");
       for (const themeData of journeyData.themes) {
@@ -175546,9 +175585,9 @@ function setup127() {
             journeyData = fileData.trees[options.journeyId];
           } else if (typeof options.journeyId === "undefined" && fileData.trees) {
             [journeyData] = Object.values(fileData.trees);
-          } else if (typeof options.journeyId !== "undefined" && options.journeyId === _optionalChain([fileData, 'access', _415 => _415.tree, 'optionalAccess', _416 => _416._id])) {
+          } else if (typeof options.journeyId !== "undefined" && options.journeyId === _optionalChain([fileData, 'access', _411 => _411.tree, 'optionalAccess', _412 => _412._id])) {
             journeyData = fileData;
-          } else if (typeof options.journeyId === "undefined" && _optionalChain([fileData, 'access', _417 => _417.tree, 'optionalAccess', _418 => _418._id])) {
+          } else if (typeof options.journeyId === "undefined" && _optionalChain([fileData, 'access', _413 => _413.tree, 'optionalAccess', _414 => _414._id])) {
             journeyData = fileData;
           } else {
             throw new Error(
@@ -175985,7 +176024,6 @@ var { getConnectionProfile: getConnectionProfile2, saveConnectionProfile: saveCo
 var SECONDS_IN_30_DAYS = 2592e3;
 var SECONDS_IN_1_HOUR = 3600;
 var LOG_TIME_WINDOW_MAX = SECONDS_IN_30_DAYS;
-var LOG_TIME_WINDOW_INCREMENT = 1;
 var deploymentTypes48 = ["cloud"];
 function setup135() {
   const program2 = new FrodoCommand(
@@ -175999,9 +176037,14 @@ function setup135() {
     new Option(
       "-l, --level <level>",
       "Set log level filter. You can specify the level as a number or a string.   Following values are possible (values on the same line are equivalent):   \n0, SEVERE, FATAL, or ERROR\n1, WARNING, WARN or CONFIG  \n2, INFO or INFORMATION\n3, DEBUG, FINE, FINER or FINEST  \n4 or ALL"
-    ).default("ERROR", `${resolveLevel2("ERROR")}`)
+    ).default("ALL", `${resolveLevel2("ALL")}`)
   ).addOption(
     new Option("-t, --transaction-id <txid>", "Filter by transactionId")
+  ).addOption(
+    new Option(
+      "-f, --query-filter <filter exp>",
+      "Filter using a query expression"
+    )
   ).addOption(
     new Option(
       "-b, --begin-timestamp <beginTs>",
@@ -176063,65 +176106,64 @@ function setup135() {
     if (foundCredentials) {
       const now = Date.now() / 1e3;
       const nowString = new Date(now * 1e3).toISOString();
-      if (typeof options.beginTimestamp === "undefined" || !options.beginTimestamp) {
-        const tempStartDate = /* @__PURE__ */ new Date();
-        tempStartDate.setTime((now - SECONDS_IN_1_HOUR) * 1e3);
-        options.beginTimestamp = tempStartDate.toISOString();
-        const tempEndDate = /* @__PURE__ */ new Date();
-        tempEndDate.setTime(now * 1e3);
-        options.endTimestamp = tempEndDate;
-        printMessage2(
-          "No timestamps specified, defaulting to logs from 1 hour ago",
-          "info"
-        );
-      }
-      if (typeof options.endTimestamp === "undefined" || !options.endTimestamp) {
-        options.endTimestamp = nowString;
-        printMessage2(
-          'No end timestamp specified, defaulting end timestamp to "now"',
-          "info"
-        );
-      }
-      let beginTs = Date.parse(options.beginTimestamp) / 1e3;
-      const endTs = Date.parse(options.endTimestamp) / 1e3;
-      if (endTs < beginTs) {
-        printMessage2(
-          "End timestamp can not be before begin timestamp",
-          "error"
-        );
-        process.exitCode = 1;
-        return;
-      }
-      if (now - beginTs > LOG_TIME_WINDOW_MAX) {
-        printMessage2(
-          "Begin timestamp can not be more than 30 days in the past",
-          "error"
-        );
-        process.exitCode = 1;
-        return;
+      let beginTs = -1;
+      let endTs = -1;
+      if ((typeof options.beginTimestamp === "undefined" || !options.beginTimestamp) && (typeof options.endTimestamp === "undefined" || !options.endTimestamp)) {
+        beginTs = -1;
+        endTs = -1;
+      } else {
+        if (typeof options.beginTimestamp === "undefined" || !options.beginTimestamp) {
+          const tempStartDate = /* @__PURE__ */ new Date();
+          tempStartDate.setTime((now - SECONDS_IN_1_HOUR) * 1e3);
+          options.beginTimestamp = tempStartDate.toISOString();
+          const tempEndDate = /* @__PURE__ */ new Date();
+          tempEndDate.setTime(now * 1e3);
+          options.endTimestamp = tempEndDate;
+          printMessage2(
+            "No begin timestamp specified, defaulting to logs from 1 hour ago",
+            "info"
+          );
+        }
+        if (typeof options.endTimestamp === "undefined" || !options.endTimestamp) {
+          options.endTimestamp = nowString;
+          printMessage2(
+            'No end timestamp specified, defaulting end timestamp to "now"',
+            "info"
+          );
+        }
+        beginTs = Date.parse(options.beginTimestamp) / 1e3;
+        endTs = Date.parse(options.endTimestamp) / 1e3;
+        if (endTs < beginTs) {
+          printMessage2(
+            "End timestamp can not be before begin timestamp",
+            "error"
+          );
+          process.exitCode = 1;
+          return;
+        }
+        if (now - beginTs > LOG_TIME_WINDOW_MAX) {
+          printMessage2(
+            "Begin timestamp can not be more than 30 days in the past",
+            "error"
+          );
+          process.exitCode = 1;
+          return;
+        }
       }
-      let intermediateEndTs = 0;
       printMessage2(
         `Fetching ID Cloud logs from the following sources: ${command.opts().sources} and levels [${resolveLevel2(command.opts().level)}] of ${conn.tenant}...`
       );
-      let timeIncrement = LOG_TIME_WINDOW_INCREMENT;
-      if (endTs - beginTs > 30) {
-        timeIncrement = timeIncrement * 30;
-      }
-      do {
-        intermediateEndTs = beginTs + timeIncrement;
-        await fetchLogs(
-          command.opts().sources,
-          new Date(beginTs * 1e3).toISOString(),
-          new Date(intermediateEndTs * 1e3).toISOString(),
-          resolveLevel2(command.opts().level),
-          command.opts().transactionId,
-          command.opts().searchString,
-          null,
-          getNoiseFilters(options.defaults)
-        );
-        beginTs = intermediateEndTs;
-      } while (intermediateEndTs < endTs);
+      await fetchLogs(
+        command.opts().sources,
+        beginTs == -1 ? null : new Date(beginTs * 1e3).toISOString(),
+        endTs == -1 ? null : new Date(endTs * 1e3).toISOString(),
+        resolveLevel2(command.opts().level),
+        command.opts().transactionId,
+        command.opts().queryFilter,
+        command.opts().searchString,
+        null,
+        getNoiseFilters(options.defaults)
+      );
     } else {
       printMessage2("No log api credentials found!");
       program2.help();
@@ -176360,7 +176402,7 @@ function setup141() {
     new Option(
       "-l, --level <level>",
       "Set log level filter. You can specify the level as a number or a string.   Following values are possible (values on the same line are equivalent):   \n0, SEVERE, FATAL, or ERROR\n1, WARNING, WARN or CONFIG  \n2, INFO or INFORMATION\n3, DEBUG, FINE, FINER or FINEST  \n4 or ALL"
-    ).default("ERROR", `${resolveLevel3("ERROR")}`)
+    ).default("ALL", `${resolveLevel3("ALL")}`)
   ).addOption(
     new Option("-t, --transaction-id <txid>", "Filter by transactionId")
   ).addOption(
@@ -177424,7 +177466,7 @@ async function importServiceFromFile(serviceId, file, options = {
     );
     const data2 = fs35.default.readFileSync(filePath, "utf8");
     const importData = JSON.parse(data2);
-    if (_optionalChain([importData, 'optionalAccess', _419 => _419.service, 'access', _420 => _420[serviceId]])) {
+    if (_optionalChain([importData, 'optionalAccess', _415 => _415.service, 'access', _416 => _416[serviceId]])) {
       await importService2(serviceId, importData, options);
       stopProgressIndicator2(
         indicatorId,
@@ -178641,7 +178683,7 @@ async function listRealms(long = false) {
   } catch (error2) {
     printMessage2(error2, "error");
     printMessage2(`Error listing realms: ${error2.message}`, "error");
-    printMessage2(_optionalChain([error2, 'access', _421 => _421.response, 'optionalAccess', _422 => _422.data]), "error");
+    printMessage2(_optionalChain([error2, 'access', _417 => _417.response, 'optionalAccess', _418 => _418.data]), "error");
   }
 }
 async function exportRealmById(realmId, file, includeMeta = true) {
@@ -181438,7 +181480,7 @@ var compareVersions = (v12, v2) => {
 // package.json
 var package_default2 = {
   name: "@rockcarver/frodo-cli",
-  version: "3.0.6",
+  version: "3.0.7",
   type: "module",
   description: "A command line interface to manage ForgeRock Identity Cloud tenants, ForgeOps deployments, and classic deployments.",
   keywords: [
@@ -181553,7 +181595,7 @@ var package_default2 = {
     ]
   },
   devDependencies: {
-    "@rockcarver/frodo-lib": "3.3.0",
+    "@rockcarver/frodo-lib": "3.3.1",
     "@types/colors": "^1.2.1",
     "@types/fs-extra": "^11.0.1",
     "@types/jest": "^29.2.3",