Reuse spinner

Author: jdalton

.dep-stats.json

@@ -10,7 +10,7 @@
     "@socketregistry/is-unicode-supported": "^1.0.1",
     "@socketregistry/packageurl-js": "^1.0.2",
     "@socketsecurity/config": "^2.1.3",
-    "@socketsecurity/registry": "^1.0.107",
+    "@socketsecurity/registry": "^1.0.108",
     "@socketsecurity/sdk": "^1.4.5",
     "blessed": "^0.1.81",
     "blessed-contrib": "^4.11.0",
@@ -72,7 +72,7 @@
     "@socketregistry/is-interactive": "^1.0.1",
     "@socketregistry/packageurl-js": "^1.0.2",
     "@socketsecurity/config": "^2.1.3",
-    "@socketsecurity/registry": "^1.0.107",
+    "@socketsecurity/registry": "^1.0.108",
     "@socketsecurity/sdk": "^1.4.5",
     "blessed": "^0.1.81",
     "blessed-contrib": "^4.11.0",

package-lock.json

@@ -77,7 +77,7 @@
     "@socketregistry/is-unicode-supported": "^1.0.1",
     "@socketregistry/packageurl-js": "^1.0.2",
     "@socketsecurity/config": "^2.1.3",
-    "@socketsecurity/registry": "^1.0.107",
+    "@socketsecurity/registry": "^1.0.108",
     "@socketsecurity/sdk": "^1.4.5",
     "blessed": "^0.1.81",
     "blessed-contrib": "^4.11.0",

package.json

@@ -4,11 +4,11 @@ import fs from 'node:fs/promises'
 import ScreenWidget from 'blessed/lib/widgets/screen'
 import contrib from 'blessed-contrib'
 
-import { Spinner } from '@socketsecurity/registry/lib/spinner'
-
+import constants from '../../constants'
 import { handleApiCall, handleUnsuccessfulApiResponse } from '../../utils/api'
 import { setupSdk } from '../../utils/sdk'
 
+import type { Spinner } from '@socketsecurity/registry/lib/spinner'
 import type { Widgets } from 'blessed' // Note: Widgets does not seem to actually work as code :'(
 
 type FormattedData = {
@@ -73,7 +73,10 @@ export async function displayAnalytics({
   outputJson: boolean
   filePath: string
 }): Promise<void> {
-  const spinner = new Spinner({ text: 'Fetching analytics data' }).start()
+  // Lazily access constants.spinner.
+  const { spinner } = constants
+
+  spinner.start('Fetching analytics data')
 
   let data: undefined | { [key: string]: any }[]
   if (scope === 'org') {

src/commands/analytics/display-analytics.ts

@@ -1,6 +1,6 @@
 import { Separator, select } from '@socketsecurity/registry/lib/prompts'
-import { Spinner } from '@socketsecurity/registry/lib/spinner'
 
+import constants from '../../constants'
 import { handleApiCall, handleUnsuccessfulApiResponse } from '../../utils/api'
 import { setupSdk } from '../../utils/sdk'
 
@@ -33,9 +33,10 @@ export async function getAuditLog({
   perPage: number
   type: string
 }): Promise<void> {
-  const spinner = new Spinner({
-    text: `Looking up audit log for ${orgSlug}\n`
-  }).start()
+  // Lazily access constants.spinner.
+  const { spinner } = constants
+
+  spinner.start(`Looking up audit log for ${orgSlug}`)
 
   const socketSdk = await setupSdk(apiToken)
   const result = await handleApiCall(

src/commands/audit-log/get-audit-log.ts

@@ -2,8 +2,7 @@
 import chalkTable from 'chalk-table'
 import colors from 'yoctocolors-cjs'
 
-import { Spinner } from '@socketsecurity/registry/lib/spinner'
-
+import constants from '../../constants'
 import { handleApiCall, handleUnsuccessfulApiResponse } from '../../utils/api'
 import { AuthError } from '../../utils/errors'
 import { getDefaultToken, setupSdk } from '../../utils/sdk'
@@ -23,7 +22,11 @@ export async function findDependencies({
       'User must be authenticated to run this command. To log in, run the command `socket login` and enter your API key.'
     )
   }
-  const spinner = new Spinner({ text: 'Searching dependencies...' }).start()
+  // Lazily access constants.spinner.
+  const { spinner } = constants
+
+  spinner.start('Searching dependencies...')
+
   const socketSdk = await setupSdk(apiToken)
 
   const result = await handleApiCall(

src/commands/dependencies/find-dependencies.ts

@@ -3,8 +3,7 @@ import util from 'node:util'
 
 import colors from 'yoctocolors-cjs'
 
-import { Spinner } from '@socketsecurity/registry/lib/spinner'
-
+import constants from '../../constants'
 import { handleAPIError, queryAPI } from '../../utils/api'
 
 export async function getDiffScan(
@@ -25,7 +24,8 @@ export async function getDiffScan(
   },
   apiToken: string
 ): Promise<void> {
-  const spinner = new Spinner()
+  // Lazily access constants.spinner.
+  const { spinner } = constants
 
   spinner.start('Getting diff scan...')
 

src/commands/diff-scan/get-diff-scan.ts

@@ -4,7 +4,6 @@ import {
   fetchPackagePackument,
   readPackageJson
 } from '@socketsecurity/registry/lib/packages'
-import { Spinner } from '@socketsecurity/registry/lib/spinner'
 
 import constants from '../../constants'
 import {
@@ -29,7 +28,11 @@ function isTopLevel(tree: SafeNode, node: SafeNode): boolean {
 }
 
 export async function runFix() {
-  const spinner = new Spinner().start()
+  // Lazily access constants.spinner.
+  const { spinner } = constants
+
+  spinner.start()
+
   const cwd = process.cwd()
   const editablePkgJson = await readPackageJson(cwd, { editable: true })
   // const agentDetails = await detect()

src/commands/fix/run-fix.ts

@@ -1,7 +1,6 @@
-import { Spinner } from '@socketsecurity/registry/lib/spinner'
-
 import { fetchPackageInfo } from './fetch-package-info'
 import { formatPackageInfo } from './format-package-info'
+import constants from '../../constants'
 
 import type { SocketSdkAlert } from '../../utils/alert/severity'
 import type { SocketSdkReturnType } from '@socketsecurity/sdk'
@@ -29,11 +28,15 @@ export async function getPackageInfo({
   pkgVersion: string
   strict: boolean
 }) {
-  const spinnerText =
+  // Lazily access constants.spinner.
+  const { spinner } = constants
+
+  spinner.start(
     pkgVersion === 'latest'
       ? `Looking up data for the latest version of ${pkgName}`
       : `Looking up data for version ${pkgVersion} of ${pkgName}`
-  const spinner = new Spinner({ text: spinnerText }).start()
+  )
+
   const packageData = await fetchPackageInfo(
     pkgName,
     pkgVersion,

src/commands/info/get-package-info.ts

@@ -1,7 +1,6 @@
 import terminalLink from 'terminal-link'
 
 import { confirm, password, select } from '@socketsecurity/registry/lib/prompts'
-import { Spinner } from '@socketsecurity/registry/lib/spinner'
 
 import { applyLogin } from './apply-login'
 import constants from '../../constants'
@@ -28,18 +27,17 @@ export async function attemptLogin(
   apiBaseUrl: string | undefined,
   apiProxy: string | undefined
 ) {
+  apiBaseUrl ??= getSetting('apiBaseUrl') ?? undefined
+  apiProxy ??= getSetting('apiProxy') ?? undefined
   const apiToken =
     (await password({
       message: `Enter your ${terminalLink(
         'Socket.dev API key',
         'https://docs.socket.dev/docs/api-keys'
       )} (leave blank for a public key)`
     })) || SOCKET_PUBLIC_API_TOKEN
-
-  apiBaseUrl ??= getSetting('apiBaseUrl') ?? undefined
-  apiProxy ??= getSetting('apiProxy') ?? undefined
-
-  const spinner = new Spinner()
+  // Lazily access constants.spinner.
+  const { spinner } = constants
 
   spinner.start('Verifying API key...')
 
@@ -65,7 +63,6 @@ export async function attemptLogin(
     }))
 
   let enforcedOrgs: Array<string> = []
-
   if (enforcedChoices.length > 1) {
     const id = <string | null>await select(
       {