feat(cr): cr

Author: billxinli

src/cli.mts

@@ -28,9 +28,12 @@ import { socketPackageLink } from './utils/terminal-link.mts'
 
 const __filename = fileURLToPath(import.meta.url)
 
+// Capture CLI start time at module level for global error handlers.
+const cliStartTime = Date.now()
+
 void (async () => {
   // Track CLI start for telemetry.
-  const cliStartTime = await trackCliStart(process.argv)
+  await trackCliStart(process.argv)
 
   const registryUrl = lookupRegistryUrl()
   await updateNotifier({
@@ -129,7 +132,7 @@ void (async () => {
   console.error('Fatal error:', err)
 
   // Track CLI error for fatal exceptions.
-  await trackCliError(process.argv, Date.now(), err, 1)
+  await trackCliError(process.argv, cliStartTime, err, 1)
 
   // Finalize telemetry before fatal exit.
   await finalizeTelemetry()
@@ -143,7 +146,7 @@ process.on('uncaughtException', async err => {
   console.error('Uncaught exception:', err)
 
   // Track CLI error for uncaught exception.
-  await trackCliError(process.argv, Date.now(), err, 1)
+  await trackCliError(process.argv, cliStartTime, err, 1)
 
   // Finalize telemetry before exit.
   await finalizeTelemetry()
@@ -158,7 +161,7 @@ process.on('unhandledRejection', async (reason, promise) => {
 
   // Track CLI error for unhandled rejection.
   const error = reason instanceof Error ? reason : new Error(String(reason))
-  await trackCliError(process.argv, Date.now(), error, 1)
+  await trackCliError(process.argv, cliStartTime, error, 1)
 
   // Finalize telemetry before exit.
   await finalizeTelemetry()

src/commands/npm/cmd-npm.mts

@@ -102,16 +102,17 @@ async function run(
   // See https://nodejs.org/api/child_process.html#event-exit.
   spawnPromise.process.on(
     'exit',
-    async (code: number | null, signalName: NodeJS.Signals | null) => {
-      // Track subprocess exit and flush telemetry.
-      await trackSubprocessExit(NPM, subprocessStartTime, code)
-
-      if (signalName) {
-        process.kill(process.pid, signalName)
-      } else if (typeof code === 'number') {
-        // eslint-disable-next-line n/no-process-exit
-        process.exit(code)
-      }
+    (code: number | null, signalName: NodeJS.Signals | null) => {
+      // Track subprocess exit and flush telemetry before exiting.
+      // Use .then() to ensure telemetry completes before process.exit().
+      void trackSubprocessExit(NPM, subprocessStartTime, code).then(() => {
+        if (signalName) {
+          process.kill(process.pid, signalName)
+        } else if (typeof code === 'number') {
+          // eslint-disable-next-line n/no-process-exit
+          process.exit(code)
+        }
+      })
     },
   )
 

src/commands/npx/cmd-npx.mts

@@ -87,16 +87,17 @@ async function run(
   // See https://nodejs.org/api/child_process.html#event-exit.
   spawnPromise.process.on(
     'exit',
-    async (code: number | null, signalName: NodeJS.Signals | null) => {
-      // Track subprocess exit and flush telemetry.
-      await trackSubprocessExit(NPX, subprocessStartTime, code)
-
-      if (signalName) {
-        process.kill(process.pid, signalName)
-      } else if (typeof code === 'number') {
-        // eslint-disable-next-line n/no-process-exit
-        process.exit(code)
-      }
+    (code: number | null, signalName: NodeJS.Signals | null) => {
+      // Track subprocess exit and flush telemetry before exiting.
+      // Use .then() to ensure telemetry completes before process.exit().
+      void trackSubprocessExit(NPX, subprocessStartTime, code).then(() => {
+        if (signalName) {
+          process.kill(process.pid, signalName)
+        } else if (typeof code === 'number') {
+          // eslint-disable-next-line n/no-process-exit
+          process.exit(code)
+        }
+      })
     },
   )
 

src/commands/pnpm/cmd-pnpm.mts

@@ -96,16 +96,17 @@ async function run(
   // See https://nodejs.org/api/child_process.html#event-exit.
   spawnPromise.process.on(
     'exit',
-    async (code: number | null, signalName: NodeJS.Signals | null) => {
-      // Track subprocess exit and flush telemetry.
-      await trackSubprocessExit(PNPM, subprocessStartTime, code)
-
-      if (signalName) {
-        process.kill(process.pid, signalName)
-      } else if (typeof code === 'number') {
-        // eslint-disable-next-line n/no-process-exit
-        process.exit(code)
-      }
+    (code: number | null, signalName: NodeJS.Signals | null) => {
+      // Track subprocess exit and flush telemetry before exiting.
+      // Use .then() to ensure telemetry completes before process.exit().
+      void trackSubprocessExit(PNPM, subprocessStartTime, code).then(() => {
+        if (signalName) {
+          process.kill(process.pid, signalName)
+        } else if (typeof code === 'number') {
+          // eslint-disable-next-line n/no-process-exit
+          process.exit(code)
+        }
+      })
     },
   )
 

src/commands/yarn/cmd-yarn.mts

@@ -96,16 +96,17 @@ async function run(
   // See https://nodejs.org/api/child_process.html#event-exit.
   spawnPromise.process.on(
     'exit',
-    async (code: number | null, signalName: NodeJS.Signals | null) => {
-      // Track subprocess exit and flush telemetry.
-      await trackSubprocessExit(YARN, subprocessStartTime, code)
-
-      if (signalName) {
-        process.kill(process.pid, signalName)
-      } else if (typeof code === 'number') {
-        // eslint-disable-next-line n/no-process-exit
-        process.exit(code)
-      }
+    (code: number | null, signalName: NodeJS.Signals | null) => {
+      // Track subprocess exit and flush telemetry before exiting.
+      // Use .then() to ensure telemetry completes before process.exit().
+      void trackSubprocessExit(YARN, subprocessStartTime, code).then(() => {
+        if (signalName) {
+          process.kill(process.pid, signalName)
+        } else if (typeof code === 'number') {
+          // eslint-disable-next-line n/no-process-exit
+          process.exit(code)
+        }
+      })
     },
   )
 

src/utils/telemetry/integration.mts

@@ -33,6 +33,7 @@ import { homedir } from 'node:os'
 import process from 'node:process'
 
 import { debugFn } from '@socketsecurity/registry/lib/debug'
+import { escapeRegExp } from '@socketsecurity/registry/lib/regexps'
 
 import { TelemetryService } from './service.mts'
 import constants, { CONFIG_KEY_DEFAULT_ORG } from '../../constants.mts'
@@ -200,7 +201,7 @@ function sanitizeArgv(argv: string[]): string[] {
     // Remove user home directory from file paths.
     const homeDir = homedir()
     if (homeDir) {
-      return arg.replace(new RegExp(homeDir, 'g'), '~')
+      return arg.replace(new RegExp(escapeRegExp(homeDir), 'g'), '~')
     }
 
     return arg
@@ -222,7 +223,7 @@ function sanitizeErrorAttribute(input: string | undefined): string | undefined {
   // Remove user home directory.
   const homeDir = homedir()
   if (homeDir) {
-    return input.replace(new RegExp(homeDir, 'g'), '~')
+    return input.replace(new RegExp(escapeRegExp(homeDir), 'g'), '~')
   }
 
   return input