chore: fix unparsable lines in monitor command

journey/pepr-deploy.ts

@@ -60,14 +60,15 @@ export function peprDeploy() {
  const stdout: String = data.toString()
  state.accept = stdout.includes("✅") ? true : state.accept
  state.reject = stdout.includes("❌") ? true : state.reject
-
+ expect(stdout.includes("IGNORED")).toBe(false)
  if (state.accept && state.reject) {
  proc.kill()
  proc.stdin.destroy()
  proc.stdout.destroy()
  proc.stderr.destroy()
  }
  })
+
  proc.on('exit', () => state.done = true);
 
  await until(() => state.done)

src/cli/monitor.ts

@@ -6,7 +6,7 @@ import { K8s, kind } from "kubernetes-fluent-client";
 import stream from "stream";
 import { ResponseItem } from "../lib/types";
 import { RootCmd } from "./root";
-
+import { sleep } from "../lib/helpers";
 export default function (program: RootCmd) {
  program
  .command("monitor [module-uuid]")
@@ -42,28 +42,29 @@ export default function (program: RootCmd) {
  const log = new K8sLog(kc);
 
  const logStream = new stream.PassThrough();
-
- logStream.on("data", chunk => {
+ logStream.on("data", async chunk => {
  const respMsg = `"msg":"Check response"`;
  // Split the chunk into lines
  const lines = chunk.toString().split("\n");
-
+ await sleep(2);
  for (const line of lines) {
  // Check for `"msg":"Hello Pepr"`
  if (line.includes(respMsg)) {
  try {
- const payload = JSON.parse(line);
+ const payload = JSON.parse(line.trim());
  const isMutate = payload.res.patchType || payload.res.warnings;
 
  const name = `${payload.namespace}${payload.name}`;
- const uid = payload.uid;
+ const uid = payload.res.uid;
 
  if (isMutate) {
- const plainPatch = atob(payload.res.patch) || "";
- const patch = JSON.stringify(JSON.parse(plainPatch), null, 2);
+ const plainPatch =
+ payload.res?.patch !== undefined && payload.res?.patch !== null
+ ? atob(payload.res.patch)
+ : "";
 
+ const patch = plainPatch !== "" && JSON.stringify(JSON.parse(plainPatch), null, 2);
  const patchType = payload.res.patchType || payload.res.warnings || "";
-
  const allowOrDeny = payload.res.allowed ? "🔀" : "🚫";
  console.log(`\n${allowOrDeny} MUTATE ${name} (${uid})`);
  if (patchType.length > 0) {

src/lib/helpers.test.ts

@@ -10,6 +10,7 @@ import {
  validateHash,
  ValidationError,
  validateCapabilityNames,
+ sleep,
 } from "./helpers";
 import { expect, describe, test, jest, beforeEach, afterEach } from "@jest/globals";
 import { parseTimeout, secretOverLimit, replaceString } from "./helpers";
@@ -292,6 +293,20 @@ const mockCapabilities: CapabilityExport[] = JSON.parse(`[
  ]
  }
 ]`);
+
+test("sleep function", async () => {
+ const startTime = Date.now();
+ const sleepTimeSeconds = 2;
+
+ await sleep(2);
+
+ const endTime = Date.now();
+ const elapsedTime = endTime - startTime;
+
+ expect(elapsedTime).toBeGreaterThanOrEqual(sleepTimeSeconds);
+ expect(elapsedTime).toBeLessThan(3 * 1000); // milliseconds to second conversion
+});
+
 describe("validateCapabilityNames", () => {
  test("should return true if all capability names are valid", () => {
  const capabilities = mockCapabilities;

src/lib/helpers.ts

@@ -9,6 +9,14 @@ import { sanitizeResourceName } from "../sdk/sdk";
 
 export class ValidationError extends Error {}
 
+export function sleep(seconds: number) {
+ return new Promise<void>(resolve => {
+ setTimeout(() => {
+ resolve();
+ }, seconds * 1000);
+ });
+}
+
 export function validateCapabilityNames(capabilities: CapabilityExport[] | undefined): void {
  if (capabilities && capabilities.length > 0) {
  for (let i = 0; i < capabilities.length; i++) {