contensis-cli 1.0.0-beta.72 → 1.0.0-beta.75

package/dist/util/index.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/util/index.ts"],
-  "sourcesContent": ["import mergeWith from 'lodash/mergeWith';\nimport { Logger } from './logger';\nimport { LogMessages as enGB } from '../localisation/en-GB.js';\n\nexport const isSharedSecret = (str = '') =>\n  str.length > 80 && str.split('-').length === 3 ? str : undefined;\n\nexport const isPassword = (str = '') =>\n  !isSharedSecret(str) ? str : undefined;\n\nexport const tryParse = (str: string) => {\n  try {\n    return typeof str === 'object' ? str : JSON.parse(str);\n  } catch (e) {\n    return false;\n  }\n};\n\nexport const isJson = (str: string) =>\n  typeof str === 'object' || !!tryParse(str);\n\nexport const tryStringify = (obj: any) => {\n  try {\n    return typeof obj === 'object' ? JSON.stringify(obj) : obj;\n  } catch (e) {\n    return obj;\n  }\n};\n\nexport const isSysError = (error: any): error is Error =>\n  error?.message !== undefined && error.stack;\n\nexport const isUuid = (str: string) => {\n  // Regular expression to check if string is a valid UUID\n  const regexExp =\n    /^[0-9a-fA-F]{8}\\b-[0-9a-fA-F]{4}\\b-[0-9a-fA-F]{4}\\b-[0-9a-fA-F]{4}\\b-[0-9a-fA-F]{12}$/gi;\n\n  return regexExp.test(str);\n};\n\nexport const url = (alias: string, project: string) => {\n  const projectAndAlias =\n    project && project.toLowerCase() !== 'website'\n      ? `${project.toLowerCase()}-${alias}`\n      : alias;\n  return {\n    api: `https://api-${alias}.cloud.contensis.com`,\n    cms: `https://cms-${alias}.cloud.contensis.com`,\n    liveWeb: `https://live-${projectAndAlias}.cloud.contensis.com`,\n    previewWeb: `https://preview-${projectAndAlias}.cloud.contensis.com`,\n    iisWeb: `https://iis-live-${projectAndAlias}.cloud.contensis.com`,\n    iisPreviewWeb: `https://iis-preview-${projectAndAlias}.cloud.contensis.com`,\n  };\n};\n\nexport const Logging = async (language = 'en-GB') => {\n  const defaultMessages = enGB;\n  // const { LogMessages: defaultMessages } = await import(\n  //   `../localisation/en-GB.js`\n  // );\n  let localisedMessages = defaultMessages;\n\n  if (language === 'en-GB') {\n    // Using a variable import e.g. `import(`../localisation/${language}.js`);`\n    // does not play well with packaged executables\n    // So we have to hard code the import for each language individually\n  }\n  return {\n    messages: mergeWith(\n      localisedMessages,\n      defaultMessages,\n      (v, s) => v || s\n    ) as typeof defaultMessages,\n    Log: Logger,\n  };\n};\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,uBAAsB;AACtB,oBAAuB;AACvB,mBAAoC;AAE7B,MAAM,iBAAiB,CAAC,MAAM,OACnC,IAAI,SAAS,MAAM,IAAI,MAAM,GAAG,EAAE,WAAW,IAAI,MAAM;AAElD,MAAM,aAAa,CAAC,MAAM,OAC/B,CAAC,eAAe,GAAG,IAAI,MAAM;AAExB,MAAM,WAAW,CAAC,QAAgB;AACvC,MAAI;AACF,WAAO,OAAO,QAAQ,WAAW,MAAM,KAAK,MAAM,GAAG;AAAA,EACvD,SAAS,GAAP;AACA,WAAO;AAAA,EACT;AACF;AAEO,MAAM,SAAS,CAAC,QACrB,OAAO,QAAQ,YAAY,CAAC,CAAC,SAAS,GAAG;AAEpC,MAAM,eAAe,CAAC,QAAa;AACxC,MAAI;AACF,WAAO,OAAO,QAAQ,WAAW,KAAK,UAAU,GAAG,IAAI;AAAA,EACzD,SAAS,GAAP;AACA,WAAO;AAAA,EACT;AACF;AAEO,MAAM,aAAa,CAAC,WACzB,+BAAO,aAAY,UAAa,MAAM;AAEjC,MAAM,SAAS,CAAC,QAAgB;AAErC,QAAM,WACJ;AAEF,SAAO,SAAS,KAAK,GAAG;AAC1B;AAEO,MAAM,MAAM,CAAC,OAAe,YAAoB;AACrD,QAAM,kBACJ,WAAW,QAAQ,YAAY,MAAM,YACjC,GAAG,QAAQ,YAAY,KAAK,UAC5B;AACN,SAAO;AAAA,IACL,KAAK,eAAe;AAAA,IACpB,KAAK,eAAe;AAAA,IACpB,SAAS,gBAAgB;AAAA,IACzB,YAAY,mBAAmB;AAAA,IAC/B,QAAQ,oBAAoB;AAAA,IAC5B,eAAe,uBAAuB;AAAA,EACxC;AACF;AAEO,MAAM,UAAU,OAAO,WAAW,YAAY;AACnD,QAAM,kBAAkB,aAAAA;AAIxB,MAAI,oBAAoB;AAExB,MAAI,aAAa,SAAS;AAAA,EAI1B;AACA,SAAO;AAAA,IACL,cAAU,iBAAAC;AAAA,MACR;AAAA,MACA;AAAA,MACA,CAAC,GAAG,MAAM,KAAK;AAAA,IACjB;AAAA,IACA,KAAK;AAAA,EACP;AACF;",
+  "sourcesContent": ["import mergeWith from 'lodash/mergeWith';\nimport { Logger } from './logger';\nimport { LogMessages as enGB } from '../localisation/en-GB.js';\n\nexport const isSharedSecret = (str = '') =>\n  str.length > 80 && str.split('-').length === 3 ? str : undefined;\n\nexport const isPassword = (str = '') =>\n  !isSharedSecret(str) ? str : undefined;\n\nexport const tryParse = (str: any) => {\n  try {\n    return typeof str === 'object' ? str : JSON.parse(str);\n  } catch (e) {\n    return false;\n  }\n};\n\nexport const isJson = (str: string) =>\n  typeof str === 'object' || !!tryParse(str);\n\nexport const tryStringify = (obj: any) => {\n  try {\n    return typeof obj === 'object' ? JSON.stringify(obj) : obj;\n  } catch (e) {\n    return obj;\n  }\n};\n\nexport const isSysError = (error: any): error is Error =>\n  error?.message !== undefined && error.stack;\n\nexport const isUuid = (str: string) => {\n  // Regular expression to check if string is a valid UUID\n  const regexExp =\n    /^[0-9a-fA-F]{8}\\b-[0-9a-fA-F]{4}\\b-[0-9a-fA-F]{4}\\b-[0-9a-fA-F]{4}\\b-[0-9a-fA-F]{12}$/gi;\n\n  return regexExp.test(str);\n};\n\nexport const url = (alias: string, project: string) => {\n  const projectAndAlias =\n    project && project.toLowerCase() !== 'website'\n      ? `${project.toLowerCase()}-${alias}`\n      : alias;\n  return {\n    api: `https://api-${alias}.cloud.contensis.com`,\n    cms: `https://cms-${alias}.cloud.contensis.com`,\n    liveWeb: `https://live-${projectAndAlias}.cloud.contensis.com`,\n    previewWeb: `https://preview-${projectAndAlias}.cloud.contensis.com`,\n    iisWeb: `https://iis-live-${projectAndAlias}.cloud.contensis.com`,\n    iisPreviewWeb: `https://iis-preview-${projectAndAlias}.cloud.contensis.com`,\n  };\n};\n\nexport const Logging = async (language = 'en-GB') => {\n  const defaultMessages = enGB;\n  // const { LogMessages: defaultMessages } = await import(\n  //   `../localisation/en-GB.js`\n  // );\n  let localisedMessages = defaultMessages;\n\n  if (language === 'en-GB') {\n    // Using a variable import e.g. `import(`../localisation/${language}.js`);`\n    // does not play well with packaged executables\n    // So we have to hard code the import for each language individually\n  }\n  return {\n    messages: mergeWith(\n      localisedMessages,\n      defaultMessages,\n      (v, s) => v || s\n    ) as typeof defaultMessages,\n    Log: Logger,\n  };\n};\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,uBAAsB;AACtB,oBAAuB;AACvB,mBAAoC;AAE7B,MAAM,iBAAiB,CAAC,MAAM,OACnC,IAAI,SAAS,MAAM,IAAI,MAAM,GAAG,EAAE,WAAW,IAAI,MAAM;AAElD,MAAM,aAAa,CAAC,MAAM,OAC/B,CAAC,eAAe,GAAG,IAAI,MAAM;AAExB,MAAM,WAAW,CAAC,QAAa;AACpC,MAAI;AACF,WAAO,OAAO,QAAQ,WAAW,MAAM,KAAK,MAAM,GAAG;AAAA,EACvD,SAAS,GAAP;AACA,WAAO;AAAA,EACT;AACF;AAEO,MAAM,SAAS,CAAC,QACrB,OAAO,QAAQ,YAAY,CAAC,CAAC,SAAS,GAAG;AAEpC,MAAM,eAAe,CAAC,QAAa;AACxC,MAAI;AACF,WAAO,OAAO,QAAQ,WAAW,KAAK,UAAU,GAAG,IAAI;AAAA,EACzD,SAAS,GAAP;AACA,WAAO;AAAA,EACT;AACF;AAEO,MAAM,aAAa,CAAC,WACzB,+BAAO,aAAY,UAAa,MAAM;AAEjC,MAAM,SAAS,CAAC,QAAgB;AAErC,QAAM,WACJ;AAEF,SAAO,SAAS,KAAK,GAAG;AAC1B;AAEO,MAAM,MAAM,CAAC,OAAe,YAAoB;AACrD,QAAM,kBACJ,WAAW,QAAQ,YAAY,MAAM,YACjC,GAAG,QAAQ,YAAY,KAAK,UAC5B;AACN,SAAO;AAAA,IACL,KAAK,eAAe;AAAA,IACpB,KAAK,eAAe;AAAA,IACpB,SAAS,gBAAgB;AAAA,IACzB,YAAY,mBAAmB;AAAA,IAC/B,QAAQ,oBAAoB;AAAA,IAC5B,eAAe,uBAAuB;AAAA,EACxC;AACF;AAEO,MAAM,UAAU,OAAO,WAAW,YAAY;AACnD,QAAM,kBAAkB,aAAAA;AAIxB,MAAI,oBAAoB;AAExB,MAAI,aAAa,SAAS;AAAA,EAI1B;AACA,SAAO;AAAA,IACL,cAAU,iBAAAC;AAAA,MACR;AAAA,MACA;AAAA,MACA,CAAC,GAAG,MAAM,KAAK;AAAA,IACjB;AAAA,IACA,KAAK;AAAA,EACP;AACF;",
   "names": ["enGB", "mergeWith"]
 }

package/dist/util/timers.js

@@ -0,0 +1,49 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var timers_exports = {};
+__export(timers_exports, {
+  promiseDelay: () => promiseDelay
+});
+module.exports = __toCommonJS(timers_exports);
+const promiseDelay = (delay, value) => {
+  let timeout;
+  let _reject;
+  const wait = () => new Promise((resolve, reject) => {
+    _reject = reject;
+    timeout = setTimeout(resolve, delay, value);
+  });
+  const promise = wait();
+  return {
+    promise,
+    cancel() {
+      if (timeout) {
+        clearTimeout(timeout);
+        timeout = null;
+        _reject();
+        _reject = null;
+      }
+    },
+    wait
+  };
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  promiseDelay
+});
+//# sourceMappingURL=timers.js.map

package/dist/util/timers.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../src/util/timers.ts"],
+  "sourcesContent": ["export const promiseDelay = (delay: number, value: any) => {\n  let timeout: NodeJS.Timeout | null;\n  let _reject: PromiseRejectionEvent['reason'];\n\n  const wait = () =>\n    new Promise((resolve, reject) => {\n      _reject = reject;\n      timeout = setTimeout(resolve, delay, value);\n    });\n\n  const promise = wait();\n  return {\n    promise,\n    cancel() {\n      if (timeout) {\n        clearTimeout(timeout);\n        timeout = null;\n        _reject();\n        _reject = null;\n      }\n    },\n    wait,\n  };\n};\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAO,MAAM,eAAe,CAAC,OAAe,UAAe;AACzD,MAAI;AACJ,MAAI;AAEJ,QAAM,OAAO,MACX,IAAI,QAAQ,CAAC,SAAS,WAAW;AAC/B,cAAU;AACV,cAAU,WAAW,SAAS,OAAO,KAAK;AAAA,EAC5C,CAAC;AAEH,QAAM,UAAU,KAAK;AACrB,SAAO;AAAA,IACL;AAAA,IACA,SAAS;AACP,UAAI,SAAS;AACX,qBAAa,OAAO;AACpB,kBAAU;AACV,gBAAQ;AACR,kBAAU;AAAA,MACZ;AAAA,IACF;AAAA,IACA;AAAA,EACF;AACF;",
+  "names": []
+}

package/dist/version.js

@@ -21,7 +21,7 @@ __export(version_exports, {
   LIB_VERSION: () => LIB_VERSION
 });
 module.exports = __toCommonJS(version_exports);
-const LIB_VERSION = "1.0.0-beta.72";
+const LIB_VERSION = "1.0.0-beta.75";
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   LIB_VERSION

package/dist/version.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../src/version.ts"],
-  "sourcesContent": ["export const LIB_VERSION = \"1.0.0-beta.72\";\n"],
+  "sourcesContent": ["export const LIB_VERSION = \"1.0.0-beta.75\";\n"],
   "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAO,MAAM,cAAc;",
   "names": []
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "contensis-cli",
-  "version": "1.0.0-beta.72",
+  "version": "1.0.0-beta.75",
   "description": "A fully featured Contensis command line interface with a shell UI provides simple and intuitive ways to manage or profile your content in any NodeJS terminal.",
   "repository": "https://github.com/contensis/node-cli",
   "homepage": "https://github.com/contensis/node-cli/tree/main/packages/contensis-cli#readme",

package/src/commands/get.ts

@@ -1,4 +1,5 @@
 import { Argument, Command } from 'commander';
+import { merge } from 'lodash';
 import { cliCommand } from '~/services/ContensisCliService';
 import { addGlobalOptions, mapContensisOpts } from './globalOptions';
 
@@ -175,7 +176,7 @@ Example call:
     .argument(
       '[branch]',
       'the branch of the block to get version details for',
-      'main'
+      'default'
     )
     .argument(
       '[version]',
@@ -185,7 +186,8 @@ Example call:
       'after',
       `
 Example call:
-  > get block contensis-website master latest
+  > get block contensis-website
+  > get block contensis-website develop latest
 `
     )
     .action(async (blockId: string, branch: string, version: string, opts) => {
@@ -210,7 +212,7 @@ Example call:
     .argument(
       '[branch]',
       'the branch of the block to get version details for',
-      'main'
+      'default'
     )
     .argument(
       '[version]',
@@ -218,13 +220,14 @@ Example call:
       'latest'
     )
     .addArgument(dataCenter)
+    .option('-t, --follow', 'follow block logs in near realtime', false)
     .usage('get block logs [blockId] [branch] [version] [dataCenter]')
     .addHelpText(
       'after',
       `
 Example call:
-  > get block logs contensis-website master
-  > get block logs contensis-website master latest london
+  > get block logs contensis-website default
+  > get block logs contensis-website master latest london --follow
 `
     )
     .action(
@@ -235,11 +238,16 @@ Example call:
         dataCenter: 'hq' | 'manchester' | 'london',
         opts
       ) => {
-        await cliCommand(['get', 'block', 'logs'], opts).PrintBlockLogs(
+        const parentOpts = block.opts() || {};
+        await cliCommand(
+          ['get', 'block', 'logs'],
+          merge(opts, parentOpts)
+        ).PrintBlockLogs(
           blockId,
           branch,
           version,
-          dataCenter
+          dataCenter,
+          opts.follow as boolean
         );
       }
     );

package/src/localisation/en-GB.ts

@@ -385,6 +385,14 @@ export const LogMessages = {
       `[${env}] Unable to delete block ${Logger.highlightText(
         id
       )} in project ${projectId}`,
+    stopFollow: (id: string, env: string, projectId?: string) =>
+      `[${env}]\n\n 👌 stop fetching new ${Logger.highlightText(
+        id
+      )} logs in project ${projectId}`,
+    timeoutFollow: (id: string, env: string, projectId?: string) =>
+      `[${env}]\n\n 🤏 pausing fetching new ${Logger.highlightText(
+        id
+      )} logs in project ${projectId} due to too many requests`,
   },
   webhooks: {
     list: (env: string) => `[${env}] Webhook subscriptions:`,

package/src/services/ContensisCliService.ts

@@ -5,7 +5,14 @@ import inquirer from 'inquirer';
 import to from 'await-to-js';
 import chalk from 'chalk';
 import { Component, ContentType, Project } from 'contensis-core-api';
-import { isPassword, isSharedSecret, isUuid, tryStringify, url } from '~/util';
+import {
+  isPassword,
+  isSharedSecret,
+  isUuid,
+  tryParse,
+  tryStringify,
+  url,
+} from '~/util';
 import SessionCacheProvider from '../providers/SessionCacheProvider';
 import ContensisAuthService from './ContensisAuthService';
 import CredentialProvider from '~/providers/CredentialProvider';
@@ -27,6 +34,8 @@ import { Entry, Role } from 'contensis-management-api/lib/models';
 import { csvFormatter } from '~/util/csv.formatter';
 import { xmlFormatter } from '~/util/xml.formatter';
 import { jsonFormatter } from '~/util/json.formatter';
+import { diffLogStrings } from '~/util/diff';
+import { promiseDelay } from '~/util/timers';
 import {
   printBlockVersion,
   printMigrateResult,
@@ -2009,7 +2018,8 @@ class ContensisCli {
     blockId: string,
     branch: string,
     version: string,
-    dataCenter: 'hq' | 'manchester' | 'london'
+    dataCenter: 'hq' | 'manchester' | 'london',
+    follow = false
   ) => {
     const { currentEnv, env, log, messages } = this;
     const contensis = await this.ConnectContensis();
@@ -2026,8 +2036,17 @@ class ContensisCli {
         dataCenter,
       });
 
-      if (blockLogs) {
-        this.HandleFormattingAndOutput(blockLogs, () => {
+      if (err) {
+        log.error(
+          messages.blocks.failedGetLogs(blockId, currentEnv, env.currentProject)
+        );
+        log.error(jsonFormatter(err));
+      } else if (blockLogs) {
+        const removeTrailingNewline = (logs: string) =>
+          logs.endsWith('\n') ? logs.slice(0, logs.length - 1) : logs;
+        const renderLogs = removeTrailingNewline(blockLogs);
+
+        this.HandleFormattingAndOutput(renderLogs, () => {
           // print the logs to console
           console.log(
             `  - ${blockId} ${branch} ${
@@ -2035,16 +2054,91 @@ class ContensisCli {
             } [${dataCenter}]`
           );
           log.line();
-          console.log(log.infoText(blockLogs));
-          log.line();
+          console.log(log.infoText(renderLogs));
         });
-      }
 
-      if (err) {
-        log.error(
-          messages.blocks.failedGetLogs(blockId, currentEnv, env.currentProject)
-        );
-        log.error(jsonFormatter(err));
+        // Code for the `--follow` options
+        let following = follow;
+        let alreadyShown = blockLogs;
+        let needsNewLine = false;
+        let counter = 0;
+
+        // remove existing listeners and add them back afterwards
+        const listeners = process.listeners('SIGINT');
+
+        process.removeAllListeners('SIGINT');
+        // add listener to update following to false and break out
+        process.on('SIGINT', () => {
+          Logger.warning(
+            `\n${messages.blocks.stopFollow(
+              blockId,
+              currentEnv,
+              env.currentProject
+            )}`
+          );
+          stopFollowing();
+        });
+
+        let delay = promiseDelay(5 * 1000, null);
+        const stopFollowing = () => {
+          following = false;
+          delay.cancel();
+
+          // Add back the listeners we removed previously
+          process.removeAllListeners('SIGINT');
+          for (const listener of listeners)
+            process.addListener('SIGINT', listener);
+        };
+
+        while (following) {
+          if (counter++ > 300) {
+            Logger.warning(
+              `\n${messages.blocks.timeoutFollow(
+                blockId,
+                currentEnv,
+                env.currentProject
+              )}`
+            );
+            stopFollowing();
+          }
+
+          // wait n. seconds then poll for logs again
+          await delay.wait();
+
+          const [lastErr, lastLogs] = following
+            ? await contensis.blocks.GetBlockLogs({
+                blockId,
+                branchId: branch,
+                version,
+                dataCenter,
+              })
+            : [null, null];
+
+          if (lastLogs) {
+            // Find the difference and output it next
+            const difference = diffLogStrings(lastLogs, alreadyShown);
+            if (difference) {
+              if (needsNewLine) {
+                console.log('');
+              }
+              // Take the trailing newline off of the logged output to
+              // avoid blank lines inbetween logs fetched sequentially
+              const render = removeTrailingNewline(difference);
+              console.log(log.infoText(render));
+
+              // Add what we've just rendered to already shown "cache"
+              alreadyShown += render;
+              needsNewLine = false;
+            } else {
+              // If no difference output a dot
+              process.stdout.write('.');
+              needsNewLine = true;
+            }
+          } else if (lastErr) {
+            // If error output an x
+            process.stdout.write('x');
+          }
+        }
       }
     }
   };
@@ -2149,15 +2243,16 @@ class ContensisCli {
 
     if (output) {
       let writeString = '';
+      const isText = !tryParse(obj) && typeof obj === 'string';
       if (format === 'csv') {
         writeString = csvFormatter(obj as any);
       } else if (format === 'xml') {
         writeString = xmlFormatter(obj as any);
-      } else writeString = jsonFormatter(obj);
+      } else writeString = isText ? (obj as string) : jsonFormatter(obj);
       // write output to file
       if (writeString) {
         fs.writeFileSync(output, writeString);
-        log.success(messages.app.fileOutput(format, output));
+        log.success(messages.app.fileOutput(isText ? 'text' : format, output));
       } else {
         log.info(messages.app.noFileOutput());
       }

package/src/util/diff.ts

@@ -0,0 +1,21 @@
+export const diffLogStrings = (updates: string, previous: string) => {
+  const lastFewLines = previous.split('\n').slice(-10);
+  const incomingLines = updates.split('\n');
+
+  // Find the line indices in the incoming lines
+  // of the last few lines previously rendered
+  const incomingLineIndices = [];
+  for (const lastRenderedLine of lastFewLines) {
+    if (lastRenderedLine.length > 20)
+      incomingLineIndices.push(
+        incomingLines.findIndex(
+          incomingLine => incomingLine === lastRenderedLine
+        )
+      );
+  }
+
+  // Get the new lines from the next position on from the last of the already shown lines
+  const differentFromPos = Math.max(...incomingLineIndices) + 1 || 0;
+  // Return just the incoming lines from the position we matched
+  return incomingLines.slice(differentFromPos).join('\n');
+};

package/src/util/index.ts

@@ -8,7 +8,7 @@ export const isSharedSecret = (str = '') =>
 export const isPassword = (str = '') =>
   !isSharedSecret(str) ? str : undefined;
 
-export const tryParse = (str: string) => {
+export const tryParse = (str: any) => {
   try {
     return typeof str === 'object' ? str : JSON.parse(str);
   } catch (e) {

package/src/util/timers.ts

@@ -0,0 +1,24 @@
+export const promiseDelay = (delay: number, value: any) => {
+  let timeout: NodeJS.Timeout | null;
+  let _reject: PromiseRejectionEvent['reason'];
+
+  const wait = () =>
+    new Promise((resolve, reject) => {
+      _reject = reject;
+      timeout = setTimeout(resolve, delay, value);
+    });
+
+  const promise = wait();
+  return {
+    promise,
+    cancel() {
+      if (timeout) {
+        clearTimeout(timeout);
+        timeout = null;
+        _reject();
+        _reject = null;
+      }
+    },
+    wait,
+  };
+};

package/src/version.ts

@@ -1 +1 @@
-export const LIB_VERSION = "1.0.0-beta.72";
+export const LIB_VERSION = "1.0.0-beta.75";