Fix baseline Windows OAuth login

Author: jahooma

cli/src/utils/__tests__/fingerprint.test.ts

@@ -1,6 +1,10 @@
 import { describe, test, expect } from 'bun:test'
 
-import { getFingerprintType, generateFingerprintIdSync } from '../fingerprint'
+import {
+  getFingerprintType,
+  generateFingerprintIdSync,
+  withTimeout,
+} from '../fingerprint'
 
 describe('fingerprint utilities', () => {
   describe('getFingerprintType', () => {
@@ -141,4 +145,20 @@ describe('fingerprint utilities', () => {
       })
     })
   })
+
+  describe('withTimeout', () => {
+    test('resolves when the promise finishes before the timeout', async () => {
+      await expect(
+        withTimeout(Promise.resolve('ok'), 100, 'too slow'),
+      ).resolves.toBe('ok')
+    })
+
+    test('rejects when the promise exceeds the timeout', async () => {
+      const neverResolves = new Promise<string>(() => {})
+
+      await expect(withTimeout(neverResolves, 1, 'too slow')).rejects.toThrow(
+        'too slow',
+      )
+    })
+  })
 })

cli/src/utils/fingerprint.ts

@@ -20,6 +20,28 @@ import { logger } from './logger'
 let machineIdModule: typeof import('node-machine-id') | null = null
 let systeminformationModule: typeof import('systeminformation') | null = null
 
+const ENHANCED_FINGERPRINT_TIMEOUT_MS = 3000
+
+export function withTimeout<T>(
+  promise: Promise<T>,
+  timeoutMs: number,
+  timeoutMessage: string,
+): Promise<T> {
+  let timeout: ReturnType<typeof setTimeout> | null = null
+
+  const timeoutPromise = new Promise<never>((_, reject) => {
+    timeout = setTimeout(() => {
+      reject(new Error(timeoutMessage))
+    }, timeoutMs)
+  })
+
+  return Promise.race([promise, timeoutPromise]).finally(() => {
+    if (timeout) {
+      clearTimeout(timeout)
+    }
+  })
+}
+
 async function getMachineId(): Promise<string> {
   if (!machineIdModule) {
     machineIdModule = await import('node-machine-id')
@@ -162,7 +184,11 @@ export function getFingerprintId(): Promise<string> {
  */
 export async function calculateFingerprint(): Promise<string> {
   try {
-    const fingerprint = await calculateEnhancedFingerprint()
+    const fingerprint = await withTimeout(
+      calculateEnhancedFingerprint(),
+      ENHANCED_FINGERPRINT_TIMEOUT_MS,
+      `Enhanced CLI fingerprinting timed out after ${ENHANCED_FINGERPRINT_TIMEOUT_MS}ms`,
+    )
     logger.debug(
       {
         fingerprintType: 'enhanced_cli',

cli/src/utils/open-url.ts

@@ -1,4 +1,5 @@
 import os from 'os'
+import { spawn } from 'child_process'
 
 import open from 'open'
 
@@ -16,6 +17,25 @@ import { logger } from './logger'
  * @returns `true` if the browser was (likely) opened, `false` if skipped.
  */
 export async function safeOpen(url: string): Promise<boolean> {
+  if (os.platform() === 'win32') {
+    try {
+      const subprocess = spawn(
+        'rundll32.exe',
+        ['url.dll,FileProtocolHandler', url],
+        {
+          detached: true,
+          stdio: 'ignore',
+          windowsHide: true,
+        },
+      )
+      subprocess.unref()
+      return true
+    } catch (err) {
+      logger.error(err, 'Failed to open browser with Windows URL handler')
+      return false
+    }
+  }
+
   if (os.platform() === 'linux') {
     const env = getCliEnv()
     const hasDisplay = Boolean(env.DISPLAY || env.WAYLAND_DISPLAY)