Use registry logger

Author: jdalton

src/cli.ts

@@ -7,6 +7,8 @@ import { messageWithCauses, stackWithCauses } from 'pony-cause'
 import updateNotifier from 'tiny-updater'
 import colors from 'yoctocolors-cjs'
 
+import { logger } from '@socketsecurity/registry/lib/logger'
+
 import { cmdAction } from './commands/action/cmd-action'
 import { cmdAnalytics } from './commands/analytics/cmd-analytics'
 import { cmdAuditLog } from './commands/audit-log/cmd-audit-log'
@@ -32,7 +34,6 @@ import { cmdThreatFeed } from './commands/threat-feed/cmd-threat-feed'
 import { cmdWrapper } from './commands/wrapper/cmd-wrapper'
 import constants from './constants'
 import { AuthError, InputError, captureException } from './utils/errors'
-import { getLogSymbols } from './utils/logging'
 import { meowWithSubcommands } from './utils/meow-with-subcommands'
 
 const { SOCKET, rootPkgJsonPath } = constants
@@ -103,8 +104,8 @@ void (async () => {
     } else {
       errorTitle = 'Unexpected error with no details'
     }
-    console.error(
-      `${getLogSymbols().error} ${colors.bgRed(colors.white(errorTitle + ':'))} ${errorMessage}`
+    logger.error(
+      `${colors.bgRed(colors.white(errorTitle + ':'))} ${errorMessage}`
     )
     if (errorBody) {
       console.error(`\n${errorBody}`)

src/commands/logout/attempt-logout.ts

@@ -1,5 +1,6 @@
+import { logger } from '@socketsecurity/registry/lib/logger'
+
 import { applyLogout } from './apply-logout'
-import { logger } from '../../utils/logging'
 
 export function attemptLogout() {
   try {

src/commands/manifest/convert_sbt_to_maven.ts

@@ -2,10 +2,10 @@ import path from 'node:path'
 
 import spawn from '@npmcli/promise-spawn'
 
+import { logger } from '@socketsecurity/registry/lib/logger'
 import { Spinner } from '@socketsecurity/registry/lib/spinner'
 
 import { safeReadFile } from '../../utils/fs'
-import { logger } from '../../utils/logging'
 
 export async function convertSbtToMaven(
   target: string,
@@ -76,9 +76,9 @@ export async function convertSbtToMaven(
     // TODO: what to do with multiple output files? Do we want to dump them to stdout? Raw or with separators or ?
     // TODO: maybe we can add an option to target a specific file to dump to stdout
     if (out === '-' && poms.length === 1) {
-      console.log('Result:\n```')
+      logger.log('Result:\n```')
       console.log(await safeReadFile(poms[0] as string, 'utf8'))
-      console.log('```')
+      logger.log('```')
       logger.success(`OK`)
     } else if (out === '-') {
       logger.error(

src/commands/report/create-report.ts

@@ -1,8 +1,8 @@
 import { Spinner } from '@socketsecurity/registry/lib/spinner'
+import { pluralize } from '@socketsecurity/registry/lib/words'
 
 import { handleApiCall, handleUnsuccessfulApiResponse } from '../../utils/api'
-import { debugLog } from '../../utils/debug'
-import { getLogSymbols } from '../../utils/logging'
+import { debugLog, isDebug } from '../../utils/debug'
 import { getPackageFiles } from '../../utils/path-resolve'
 import { setupSdk } from '../../utils/sdk'
 
@@ -48,32 +48,34 @@ export async function createReport(
     supportedFiles
   )
 
-  debugLog(
-    'Uploading:',
-    packagePaths.join(`\n${getLogSymbols().info} Uploading: `)
-  )
+  const { length: packagePathsCount } = packagePaths
 
+  if (packagePathsCount && isDebug()) {
+    for (const pkgPath of packagePaths) {
+      debugLog(`Uploading: ${pkgPath}`)
+    }
+  }
   if (dryRun) {
     debugLog('[dryRun] Skipped actual upload')
     return undefined
-  } else {
-    const socketSdk = await setupSdk()
-    const spinner = new Spinner({
-      text: `Creating report with ${packagePaths.length} package files`
-    }).start()
+  }
+  const spinner = new Spinner()
+
+  spinner.start(
+    `Creating report with ${packagePathsCount} package ${pluralize('file', packagePathsCount)}`
+  )
 
-    const apiCall = socketSdk.createReportFromFilePaths(
-      packagePaths,
-      cwd,
-      socketConfig?.issueRules
-    )
-    const result = await handleApiCall(apiCall, 'creating report')
+  const apiCall = socketSdk.createReportFromFilePaths(
+    packagePaths,
+    cwd,
+    socketConfig?.issueRules
+  )
+  const result = await handleApiCall(apiCall, 'creating report')
 
-    if (!result.success) {
-      handleUnsuccessfulApiResponse('createReport', result, spinner)
-      return undefined
-    }
-    spinner.successAndStop()
-    return result
+  if (!result.success) {
+    handleUnsuccessfulApiResponse('createReport', result, spinner)
+    return undefined
   }
+  spinner.successAndStop()
+  return result
 }

src/utils/color-or-markdown.ts

@@ -2,18 +2,17 @@ import terminalLink from 'terminal-link'
 import colors from 'yoctocolors-cjs'
 
 import indentString from '@socketregistry/indent-string/index.cjs'
+import { Logger } from '@socketsecurity/registry/lib/logger'
 
-import { getLogSymbols } from './logging'
+import type { LogSymbols } from '@socketsecurity/registry/lib/logger'
 
-import type { LogSymbols } from './logging'
-
-const markdownLogSymbols = <LogSymbols>{
+const markdownLogSymbols = <LogSymbols>Object.freeze({
   __proto__: null,
   info: ':information_source:',
   error: ':stop_sign:',
   success: ':white_check_mark:',
   warning: ':warning:'
-}
+})
 
 export class ColorOrMarkdown {
   public useMarkdown: boolean
@@ -77,6 +76,6 @@ export class ColorOrMarkdown {
   }
 
   get logSymbols(): LogSymbols {
-    return this.useMarkdown ? markdownLogSymbols : getLogSymbols()
+    return this.useMarkdown ? markdownLogSymbols : Logger.LOG_SYMBOLS
   }
 }

src/utils/debug.ts

@@ -1,4 +1,5 @@
-import { getLogSymbols } from './logging'
+import { logger } from '@socketsecurity/registry/lib/logger'
+
 import constants from '../constants'
 
 export function isDebug() {
@@ -8,6 +9,6 @@ export function isDebug() {
 
 export function debugLog(...args: any[]) {
   if (isDebug()) {
-    console.error(getLogSymbols().info, ...args)
+    logger.info(...args)
   }
 }

src/utils/logging.ts

@@ -4,9 +4,9 @@ import path from 'node:path'
 import process from 'node:process'
 
 import config from '@socketsecurity/config'
+import { logger } from '@socketsecurity/registry/lib/logger'
 
 import { safeReadFileSync } from './fs'
-import { logger } from './logging'
 import constants from '../constants'
 
 const LOCALAPPDATA = 'LOCALAPPDATA'