fix: use time ago format and fix issues with selectCloudWatchLogStream

Author: jedwards1211

package.json

@@ -60,12 +60,13 @@
     "typescript": "^5.1.0"
   },
   "dependencies": {
-    "@aws-sdk/client-ec2": "^3.499.0",
     "@aws-sdk/client-cloudwatch-logs": "^3.499.0",
+    "@aws-sdk/client-ec2": "^3.499.0",
     "@babel/runtime": "^7.18.6",
     "async-autocomplete-cli": "^1.0.0",
     "chalk": "^4.0.0",
     "fs-extra": "^9.1.0",
+    "javascript-time-ago": "^2.5.10",
     "jmespath": "^0.16.0",
     "yargs": "^17.7.2"
   },

pnpm-lock.yaml

@@ -17,8 +17,8 @@ import {
 import { Readable, Writable } from 'stream'
 import { loadRecents, addRecent } from './recents'
 import stripAnsi from 'strip-ansi'
-import { formatDate } from './formatDate'
 import { column } from './column'
+import timeAgo from './timeAgo'
 
 export type LogGroupForChoice = Pick<
   LogGroup,
@@ -36,10 +36,7 @@ function createChoice(
     options?.recent
       ? chalk.magentaBright('(recent)')
       : ' '.repeat('(recent)'.length)
-  }  ${column(
-    formatDate(new Date(creationTime ?? NaN)),
-    '2022/03/17 17:37'.length
-  )}`
+  }  ${column(timeAgo(creationTime ?? NaN), '2022/03/17 17:37'.length)}`
   return {
     title:
       column(

src/selectCloudWatchLogGroup.ts

@@ -19,13 +19,13 @@ import {
 import { Readable, Writable } from 'stream'
 import { loadRecents, addRecent } from './recents'
 import stripAnsi from 'strip-ansi'
-import { formatDate } from './formatDate'
 import { column } from './column'
 import selectCloudWatchLogGroup from './selectCloudWatchLogGroup'
+import timeAgo from './timeAgo'
 
 export type LogStreamForChoice = Pick<
   LogStream,
-  'arn' | 'logStreamName' | 'creationTime'
+  'arn' | 'logStreamName' | 'creationTime' | 'lastEventTimestamp'
 >
 
 type ChoiceProps = {
@@ -38,15 +38,12 @@ function createChoice(
   LogStream: LogStreamForChoice,
   options?: { recent?: boolean }
 ): Choice<ChoiceProps> {
-  const { arn, logStreamName, creationTime } = LogStream
+  const { arn, logStreamName, lastEventTimestamp } = LogStream
   const rest = `  ${
     options?.recent
       ? chalk.magentaBright('(recent)')
       : ' '.repeat('(recent)'.length)
-  }  ${column(
-    formatDate(new Date(creationTime ?? NaN)),
-    '2022/03/17 17:37'.length
-  )}`
+  }  ${column(timeAgo(lastEventTimestamp ?? NaN), '59 minutes ago'.length)}`
   return {
     title:
       column(
@@ -103,6 +100,28 @@ export default async function selectCloudWatchLogStream({
   }
 
   const cachedPages: DescribeLogStreamsCommandOutput[] = []
+  let loadedCount = 0
+
+  const args: DescribeLogStreamsRequest = {
+    limit: 50,
+    logGroupName,
+    logGroupIdentifier,
+    orderBy: 'LastEventTime',
+    descending: true,
+  }
+  async function* paginateWithCache() {
+    yield* cachedPages
+    if (loadedCount >= MaxLoad) return
+    for await (const page of paginateDescribeLogStreams(
+      { client: logs },
+      { ...args, nextToken: cachedPages[cachedPages.length - 1]?.nextToken }
+    )) {
+      cachedPages.push(page)
+      yield page
+      loadedCount += page.logStreams?.length ?? 0
+      if (loadedCount >= MaxLoad) break
+    }
+  }
 
   const selected = await asyncAutocomplete({
     ...autocompleteOpts,
@@ -129,14 +148,6 @@ export default async function selectCloudWatchLogStream({
         yieldChoices(choices)
       }
 
-      let loadedCount = 0
-      const args: DescribeLogStreamsRequest = {
-        limit: 50,
-        logGroupName,
-        logGroupIdentifier,
-        orderBy: 'LastEventTime',
-        descending: true,
-      }
       let regex
       try {
         regex = new RegExp(input.trim(), 'i')
@@ -150,19 +161,7 @@ export default async function selectCloudWatchLogStream({
       const ac = new AbortController()
       cancelationToken.once('canceled', () => ac.abort())
 
-      async function* paginateWithLoaded() {
-        yield* cachedPages
-        for await (const page of paginateDescribeLogStreams(
-          { client: logs },
-          { ...args, nextToken: cachedPages[cachedPages.length - 1]?.nextToken }
-        )) {
-          cachedPages.push(page)
-          yield page
-        }
-      }
-
-      for await (const page of paginateWithLoaded()) {
-        cachedPages.push(page)
+      for await (const page of paginateWithCache()) {
         const { logStreams = [] } = page
         if (ac.signal.aborted) break
         for (const LogStream of logStreams) {
@@ -175,8 +174,6 @@ export default async function selectCloudWatchLogStream({
           if (choices.length >= MaxResults) break
         }
         if (choices.length >= MaxResults) break
-        loadedCount += logStreams.length
-        if (loadedCount >= MaxLoad) break
       }
 
       if (!choices.length) {

src/selectCloudWatchLogStream.ts

@@ -21,8 +21,8 @@ import {
 } from '@aws-sdk/client-ec2'
 
 import { loadRecents, addRecent } from './recents'
-import { formatDate } from './formatDate'
 import { column } from './column'
+import timeAgo from './timeAgo'
 
 function formatState(State: SnapshotState | null | undefined): string {
   if (!State) return ''
@@ -58,7 +58,7 @@ function createChoice(
   )}  ${column(
     options?.recent ? chalk.magentaBright('(recent)') : formatState(State),
     stateLength
-  )}  ${column(formatDate(StartTime), '2022/03/17 17:37'.length)}`
+  )}  ${column(timeAgo(StartTime ?? NaN), '59 minutes ago'.length)}`
   return {
     title:
       column(

src/selectEBSSnapshot.ts

@@ -18,8 +18,8 @@ import {
 import { Readable, Writable } from 'stream'
 import { loadRecents, addRecent } from './recents'
 import stripAnsi from 'strip-ansi'
-import { formatDate } from './formatDate'
 import { column } from './column'
+import timeAgo from './timeAgo'
 
 function formatState(State: InstanceState | null | undefined): string {
   if (!State) return ''
@@ -58,7 +58,7 @@ function createChoice(
   const rest = `  ${column(InstanceId, 19)}  ${column(
     options?.recent ? chalk.magentaBright('(recent)') : formatState(State),
     stateLength
-  )}  ${column(formatDate(LaunchTime), '2022/03/17 17:37'.length)}`
+  )}  ${column(timeAgo(LaunchTime ?? NaN), '59 minutes ago'.length)}`
   return {
     title:
       column(

src/selectEC2Instance.ts

@@ -0,0 +1,12 @@
+import TimeAgo from 'javascript-time-ago'
+
+import en from 'javascript-time-ago/locale/en'
+
+TimeAgo.addLocale(en)
+
+const _timeAgo = new TimeAgo('en-US')
+
+export default function timeAgo(input: number | Date): string {
+  const result = _timeAgo.format(input)
+  return Array.isArray(result) ? result[0] : result
+}