@beauraines/toggl-cli 2.8.9 → 2.8.11

package/CHANGELOG.md

@@ -2,6 +2,20 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [2.8.11](https://github.com/beauraines/toggl-cli/compare/v2.8.10...v2.8.11) (2026-05-02)
+
+
+### Bug Fixes
+
+* **deps:** bump dotenv from 17.3.1 to 17.4.2 ([#246](https://github.com/beauraines/toggl-cli/issues/246)) ([966b073](https://github.com/beauraines/toggl-cli/commit/966b073985aed7c580a2ed2997d22cb9b789c51f))
+
+### [2.8.10](https://github.com/beauraines/toggl-cli/compare/v2.8.9...v2.8.10) (2026-04-30)
+
+
+### Bug Fixes
+
+* improve error output when offline ([#243](https://github.com/beauraines/toggl-cli/issues/243)) ([#244](https://github.com/beauraines/toggl-cli/issues/244)) ([5c8caa8](https://github.com/beauraines/toggl-cli/commit/5c8caa865dfe351258c66379906a76adff58a5db))
+
 ### [2.8.9](https://github.com/beauraines/toggl-cli/compare/v2.8.8...v2.8.9) (2026-04-13)
 
 ### [2.8.8](https://github.com/beauraines/toggl-cli/compare/v2.8.7...v2.8.8) (2026-04-05)

package/client.js

@@ -8,6 +8,39 @@ const debug = debugClient('toggl-cli-client')
 
 const QUOTA_WARNING_THRESHOLD = 5
 
+const NETWORK_ERROR_CODES = new Set([
+  'ENOTFOUND',
+  'ECONNREFUSED',
+  'ETIMEDOUT',
+  'ENETUNREACH',
+  'ECONNRESET',
+  'EAI_AGAIN',
+  'EHOSTUNREACH',
+])
+
+const NETWORK_ERROR_MESSAGES = {
+  ENOTFOUND: 'Unable to resolve host — are you connected to the internet?',
+  ECONNREFUSED: 'Connection refused by the server.',
+  ETIMEDOUT: 'Connection timed out — the server may be unreachable.',
+  ENETUNREACH: 'Network is unreachable — check your internet connection.',
+  ECONNRESET: 'Connection was reset — please try again.',
+  EAI_AGAIN: 'DNS lookup failed — check your internet connection and try again.',
+  EHOSTUNREACH: 'Host is unreachable — check your internet connection.',
+}
+
+/**
+ * Strips sensitive credentials (API tokens, passwords) from a string
+ * to prevent accidental leakage in error output.
+ */
+export function sanitizeErrorMessage (message) {
+  if (!message) return message
+  // Strip Basic auth header values
+  message = message.replace(/Basic\s+[A-Za-z0-9+/=]+/g, 'Basic [REDACTED]')
+  // Strip API tokens in URLs (username:password@host pattern)
+  message = message.replace(/\/\/[^@/]+@/g, '//[REDACTED]@')
+  return message
+}
+
 export default async function () {
   let  conf
   try {
@@ -29,10 +62,26 @@ export default async function () {
      process.exit(1)
    }
 
-  // Wrap request method to warn when API quota is running low
+  // Wrap request method to handle errors and warn on quota
   const originalRequest = client.request.bind(client)
   client.request = async function (...args) {
-    const result = await originalRequest(...args)
+    let result
+    try {
+      result = await originalRequest(...args)
+    } catch (error) {
+      if (NETWORK_ERROR_CODES.has(error.code)) {
+        const friendlyMessage = NETWORK_ERROR_MESSAGES[error.code] || 'A network error occurred.'
+        console.error(chalk.red(`\n✖ ${friendlyMessage}`))
+        debug('Full error details: %O', error)
+        process.exit(1)
+      }
+      // For non-network errors, sanitize and re-throw
+      if (error.message) {
+        error.message = sanitizeErrorMessage(error.message)
+      }
+      throw error
+    }
+
     if (client.quota && client.quota.remaining !== null && client.quota.remaining <= QUOTA_WARNING_THRESHOLD) {
       const minutes = client.quota.resetsIn ? Math.ceil(client.quota.resetsIn / 60) : '?'
       console.error(chalk.yellow(`\n⚠ API quota low: ${client.quota.remaining} requests remaining (resets in ~${minutes}m)`))

package/client.test.js

@@ -0,0 +1,29 @@
+import { describe, it, expect } from '@jest/globals'
+import { sanitizeErrorMessage } from './client.js'
+
+describe('sanitizeErrorMessage', () => {
+  it('should strip Basic auth header values', () => {
+    const input = 'Request failed: Basic YTQyOTk3YzEyZjExMTI4OTM0NGNlZDdlYWVkMmM6YXBpX3Rva2Vu'
+    const result = sanitizeErrorMessage(input)
+    expect(result).toBe('Request failed: Basic [REDACTED]')
+    expect(result).not.toContain('YTQyOTk3')
+  })
+
+  it('should strip credentials from URLs', () => {
+    const input = 'getaddrinfo ENOTFOUND at https://a42997c12f112821289344ced7eaed2c:api_token@api.track.toggl.com/api/v9/me'
+    const result = sanitizeErrorMessage(input)
+    expect(result).toContain('[REDACTED]@api.track.toggl.com')
+    expect(result).not.toContain('a42997c12f112821289344ced7eaed2c')
+  })
+
+  it('should handle null/undefined input', () => {
+    expect(sanitizeErrorMessage(null)).toBeNull()
+    expect(sanitizeErrorMessage(undefined)).toBeUndefined()
+    expect(sanitizeErrorMessage('')).toBe('')
+  })
+
+  it('should not modify messages without credentials', () => {
+    const input = 'Connection timed out'
+    expect(sanitizeErrorMessage(input)).toBe('Connection timed out')
+  })
+})

package/cmds/index.mjs

@@ -14,7 +14,9 @@ import * as today from './today.mjs'
 import * as weekly from './weekly.mjs'
 import * as createConfig from './create-config.mjs'
 import * as quota from './quota.mjs'
-export const commands = [
+import { withErrorHandling } from '../errorHandler.js'
+
+const rawCommands = [
   continueEntry,
   current,
   edit,
@@ -32,3 +34,8 @@ export const commands = [
   workspace,
   createConfig
 ]
+
+export const commands = rawCommands.map(cmd => ({
+  ...cmd,
+  handler: withErrorHandling(cmd.handler)
+}))

package/errorHandler.js

@@ -0,0 +1,26 @@
+import chalk from 'chalk'
+import debugClient from 'debug'
+import { sanitizeErrorMessage } from './client.js'
+
+const debug = debugClient('toggl-cli-error')
+
+/**
+ * Wraps a yargs command handler with error handling that catches
+ * unhandled errors and displays a user-friendly message instead
+ * of a raw stack trace with sensitive data.
+ *
+ * @param {Function} handler - The async handler function to wrap
+ * @returns {Function} - The wrapped handler
+ */
+export function withErrorHandling (handler) {
+  return async function (argv) {
+    try {
+      await handler(argv)
+    } catch (error) {
+      const message = sanitizeErrorMessage(error.message) || 'An unexpected error occurred.'
+      console.error(chalk.red(`\n✖ ${message}`))
+      debug('Full error details: %O', error)
+      process.exit(1)
+    }
+  }
+}

package/errorHandler.test.js

@@ -0,0 +1,57 @@
+import { jest, describe, it, expect, beforeEach, afterEach } from '@jest/globals'
+import { withErrorHandling } from './errorHandler.js'
+
+describe('withErrorHandling', () => {
+  let mockExit
+  let mockConsoleError
+
+  beforeEach(() => {
+    mockExit = jest.spyOn(process, 'exit').mockImplementation(() => {})
+    mockConsoleError = jest.spyOn(console, 'error').mockImplementation(() => {})
+  })
+
+  afterEach(() => {
+    mockExit.mockRestore()
+    mockConsoleError.mockRestore()
+  })
+
+  it('should call the original handler when no error occurs', async () => {
+    const handler = jest.fn()
+    const wrapped = withErrorHandling(handler)
+    await wrapped({ test: true })
+    expect(handler).toHaveBeenCalledWith({ test: true })
+    expect(mockExit).not.toHaveBeenCalled()
+  })
+
+  it('should catch errors and display a friendly message', async () => {
+    const handler = jest.fn().mockRejectedValue(new Error('Something went wrong'))
+    const wrapped = withErrorHandling(handler)
+    await wrapped({})
+    expect(mockConsoleError).toHaveBeenCalledWith(
+      expect.stringContaining('Something went wrong')
+    )
+    expect(mockExit).toHaveBeenCalledWith(1)
+  })
+
+  it('should sanitize API tokens from error messages', async () => {
+    const error = new Error(
+      'Request failed: Basic YTQyOTk3YzEyZjExMTI4OTM0NGNlZDdlYWVkMmM6YXBpX3Rva2Vu'
+    )
+    const handler = jest.fn().mockRejectedValue(error)
+    const wrapped = withErrorHandling(handler)
+    await wrapped({})
+
+    const errorOutput = mockConsoleError.mock.calls[0][0]
+    expect(errorOutput).not.toContain('YTQyOTk3')
+    expect(errorOutput).toContain('[REDACTED]')
+    expect(mockExit).toHaveBeenCalledWith(1)
+  })
+
+  it('should handle errors with no message', async () => {
+    const handler = jest.fn().mockRejectedValue(new Error())
+    const wrapped = withErrorHandling(handler)
+    await wrapped({})
+    expect(mockConsoleError).toHaveBeenCalled()
+    expect(mockExit).toHaveBeenCalledWith(1)
+  })
+})

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@beauraines/toggl-cli",
-  "version": "2.8.9",
+  "version": "2.8.11",
   "description": "CLI client for Toggl Time Tracker",
   "main": "cli.js",
   "bin": {
     "toggl": "./cli.js"
   },
   "scripts": {
-    "test": "jest",
+    "test": "NODE_OPTIONS='--experimental-vm-modules' jest",
     "lint": "eslint . ./**/*.js ./**/*.mjs",
     "lint:fix": "eslint . ./**/*.js ./**/*.mjs --fix",
     "release": "standard-version",