fix: improve logging format

matzkoh · Jul 17, 2024 · 12163dc · 12163dc
1 parent e341aa1
commit 12163dc
Show file tree

Hide file tree

Showing 5 changed files with 161 additions and 28 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -38,9 +38,12 @@
   "dependencies": {
     "@slack/socket-mode": "2.0.0",
     "@slack/web-api": "7.3.1",
+    "chalk": "5.3.0",
+    "cli-truncate": "4.0.0",
     "commander": "12.1.0",
     "emoji-datasource": "15.1.2",
     "slack-message-parser": "3.0.2",
+    "terminal-link": "3.0.0",
     "ws": "8.18.0"
   },
   "devDependencies": {

diff --git a/src/lib/index.ts b/src/lib/index.ts
@@ -4,6 +4,10 @@
   @typescript-eslint/no-unsafe-member-access,
 */
 
+import chalk from 'chalk'
+import truncate from 'cli-truncate'
+import link from 'terminal-link'
+
 import type { CliOptions } from '../bin/index.js'
 
 import { parse } from './parser.js'
@@ -53,11 +57,32 @@ export async function main(options: CliOptions) {
 
     send(options.showUsername ? `${userName}<br />${comment}` : comment)
 
-    if (options.json) {
-      console.log(JSON.stringify({ ts: Math.trunc(event.ts), channel: channelName, user: userName, url, comment }))
-    } else if (options.logging) {
-      console.log(`#${channelName} @${userName} ${url} ${comment.replace(/\s+/g, '').slice(0, 40)}`)
+    if (!options.logging) {
+      return
     }
+
+    console.log(
+      options.json
+        ? JSON.stringify({
+            ts: Math.trunc(event.ts * 1000),
+            channel: channelName,
+            user: userName,
+            url,
+            comment,
+          })
+        : truncate(
+            [
+              chalk.yellow(link(intl.format(event.ts * 1000), url)),
+              chalk.magenta(channelName),
+              chalk.green(userName),
+              slack.renderTerminal(node),
+            ]
+              .join(' ')
+              .replaceAll(/\s+/g, ' ')
+              .trim(),
+            process.stdout.columns || 80,
+          ),
+    )
   })
 
   await slack.prepare()
@@ -67,3 +92,11 @@ export async function main(options: CliOptions) {
     process.stderr.write(JSON.stringify(slack.getStats()) + '\n')
   }
 }
+
+const intl = new Intl.DateTimeFormat('ja-JP', {
+  month: 'numeric',
+  day: 'numeric',
+  hour: '2-digit',
+  minute: '2-digit',
+  second: '2-digit',
+})
diff --git a/src/lib/render.ts b/src/lib/render.ts
@@ -1,17 +1,10 @@
+import chalk from 'chalk'
 import { NodeType } from 'slack-message-parser'
+import link from 'terminal-link'
 
 import type { EmojiFixedNode } from './parser-emoji.js'
 
-export function render(
-  node: EmojiFixedNode,
-  channelMap: Map<string, string>,
-  userMap: Map<string, string>,
-  emojiMap: Map<string, string>,
-): string {
-  return toHtml(node, channelMap, userMap, emojiMap).trim()
-}
-
-function toHtml(
+export function toHtml(
   node: EmojiFixedNode,
   channelMap: Map<string, string>,
   userMap: Map<string, string>,
@@ -57,3 +50,56 @@ function toHtml(
       return node.children.map(n => toHtml(n, channelMap, userMap, emojiMap)).join('')
   }
 }
+
+export function toTerminal(
+  node: EmojiFixedNode,
+  channelMap: Map<string, string>,
+  userMap: Map<string, string>,
+  emojiMap: Map<string, string>,
+): string {
+  switch (node.type) {
+    case NodeType.Text:
+    case NodeType.PreText:
+    case NodeType.Code:
+      return node.text
+
+    case NodeType.ChannelLink:
+      return chalk.blue(
+        node.label
+          ? `#${node.label.map(n => toTerminal(n, channelMap, userMap, emojiMap)).join('')}`
+          : `#${channelMap.get(node.channelID) ?? node.channelID}`,
+      )
+
+    case NodeType.UserLink:
+      return chalk.blue(
+        node.label
+          ? `@${node.label.map(n => toTerminal(n, channelMap, userMap, emojiMap)).join('')}`
+          : `@${userMap.get(node.userID) ?? node.userID}`,
+      )
+
+    case NodeType.URL:
+      return chalk.blue(
+        link(
+          node.label
+            ? node.label.map(n => toTerminal(n, channelMap, userMap, emojiMap)).join('')
+            : new URL(node.url).hostname,
+          node.url,
+        ),
+      )
+
+    case NodeType.Command:
+      return node.label
+        ? node.label.map(n => toTerminal(n, channelMap, userMap, emojiMap)).join('')
+        : `!${[node.name, ...node.arguments].join(' ')}`
+
+    case NodeType.Emoji:
+      return `:${node.name}:`
+
+    case NodeType.Italic:
+    case NodeType.Bold:
+    case NodeType.Strike:
+    case NodeType.Quote:
+    case NodeType.Root:
+      return node.children.map(n => toTerminal(n, channelMap, userMap, emojiMap)).join('')
+  }
+}
diff --git a/src/lib/slack.ts b/src/lib/slack.ts
@@ -9,7 +9,7 @@ import type { ConversationsListArguments } from '@slack/web-api'
 import { WebClient } from '@slack/web-api'
 
 import type { EmojiFixedNode } from './parser-emoji.js'
-import { render } from './render.js'
+import { toHtml, toTerminal } from './render.js'
 
 interface Resource {
   id: string
@@ -120,7 +120,11 @@ export class SlackClient {
   }
 
   renderComment(node: EmojiFixedNode) {
-    return render(node, this.channels, this.users, this.emojis)
+    return toHtml(node, this.channels, this.users, this.emojis)
+  }
+
+  renderTerminal(node: EmojiFixedNode) {
+    return toTerminal(node, this.channels, this.users, this.emojis)
   }
 }