Fix error handling (#73)

* fix error handling

* update deps

* format

Author: abenso

eslint.config.js

@@ -1,38 +1,44 @@
-module.exports = {
-  languageOptions: {
-    ecmaVersion: 'latest',
-    sourceType: 'module',
-    globals: {
-      window: 'readonly',
-      document: 'readonly',
-      process: 'readonly',
-      require: 'readonly',
+module.exports = [
+  {
+    languageOptions: {
+      ecmaVersion: 'latest',
+      sourceType: 'module',
+      globals: {
+        window: 'readonly',
+        document: 'readonly',
+        process: 'readonly',
+        require: 'readonly',
+      },
+      parserOptions: {
+        project: 'tsconfig.json',
+      },
     },
-    parserOptions: {
-      project: 'tsconfig.json',
+    ignores: ['dist/*', 'node_modules/*'],
+    plugins: {
+      'unused-imports': require('eslint-plugin-unused-imports'),
+      '@typescript-eslint': require('@typescript-eslint/eslint-plugin'),
+      'eslint-plugin-tsdoc': require('eslint-plugin-tsdoc'),
+    },
+    rules: {
+      curly: 'warn',
+      'prefer-const': 'warn',
+      'no-else-return': 'warn',
+      complexity: ['warn', 1000],
+      'no-unneeded-ternary': 'warn',
+      'no-alert': 'warn',
+      'no-empty': 'warn',
+      'no-useless-catch': 'error',
+      'require-await': 'warn',
+      'no-continue': 'warn',
+      'no-console': 'warn',
+      'unused-imports/no-unused-imports': 'warn',
+      'no-magic-numbers': 'off',
     },
   },
-  ignores: ['dist/*', 'node_modules/*'],
-  plugins: {
-    'unused-imports': require('eslint-plugin-unused-imports'),
-    '@typescript-eslint': require('@typescript-eslint/eslint-plugin'),
-    'eslint-plugin-tsdoc': require('eslint-plugin-tsdoc'),
-    promise: require('eslint-plugin-promise'),
-  },
-  rules: {
-    curly: 'warn',
-    'prefer-const': 'warn',
-    'no-else-return': 'warn',
-    complexity: ['warn', 1000],
-    'no-unneeded-ternary': 'warn',
-    'no-alert': 'warn',
-    'no-empty': 'warn',
-    'no-useless-catch': 'error',
-    'require-await': 'warn',
-    'no-continue': 'warn',
-    'promise/prefer-await-to-then': 'warn',
-    'no-console': 'warn',
-    'unused-imports/no-unused-imports': 'warn',
-    'no-magic-numbers': 'off',
+  {
+    files: ['try.mjs'],
+    rules: {
+      'no-console': 'off',
+    },
   },
-}
+]

package.json

@@ -34,30 +34,33 @@
     "test": "yarn build && jest",
     "upgrade": "bunx npm-check-updates -i"
   },
+  "resolutions": {
+    "glob": "^11.0.0"
+  },
   "dependencies": {
-    "@ledgerhq/hw-transport": "6.31.4"
+    "@ledgerhq/hw-transport": "6.31.9"
   },
   "devDependencies": {
-    "@ledgerhq/hw-transport-mocker": "^6.28.6",
-    "@trivago/prettier-plugin-sort-imports": "^4.3.0",
-    "@types/jest": "29.5.14",
-    "@types/node": "^22.4.1",
-    "@typescript-eslint/eslint-plugin": "^8.1.0",
-    "@typescript-eslint/parser": "^8.14.0",
-    "eslint": "^9.4.0",
-    "eslint-config-prettier": "^9.1.0",
-    "eslint-config-standard-with-typescript": "^43.0.1",
-    "eslint-plugin-import": "^2.29.1",
-    "eslint-plugin-n": "^17.8.1",
-    "eslint-plugin-promise": "^7.1.0",
-    "eslint-plugin-tsdoc": "^0.3.0",
-    "eslint-plugin-unused-imports": "^4.0.0",
+    "@ledgerhq/hw-transport-mocker": "^6.29.9",
+    "@trivago/prettier-plugin-sort-imports": "^5.2.2",
+    "@types/jest": "30.0.0",
+    "@types/node": "^24.3.0",
+    "@typescript-eslint/eslint-plugin": "^8.40.0",
+    "@typescript-eslint/parser": "^8.40.0",
+    "eslint": "^9.33.0",
+    "eslint-config-love": "^121.0.0",
+    "eslint-config-prettier": "^10.1.8",
+    "eslint-plugin-import": "^2.32.0",
+    "eslint-plugin-n": "^17.21.3",
+    "eslint-plugin-promise": "^7.2.1",
+    "eslint-plugin-tsdoc": "^0.4.0",
+    "eslint-plugin-unused-imports": "^4.2.0",
     "jest": "^30.0.5",
-    "prettier": "^3.3.2",
-    "sort-package-json": "^2.10.1",
-    "ts-jest": "^29.4.0",
+    "prettier": "^3.6.2",
+    "sort-package-json": "^3.4.0",
+    "ts-jest": "^29.4.1",
     "ts-node": "^10.9.2",
-    "typescript": "^5.4.5"
+    "typescript": "^5.9.2"
   },
   "volta": {
     "node": "20.11.1",

src/app.ts

@@ -126,19 +126,27 @@ export default class BaseApp {
 
     const statusList = [LedgerError.NoErrors, LedgerError.DataIsInvalid, LedgerError.BadKeyHandle]
 
-    let responseBuffer
-
     try {
-      responseBuffer = await this.transport.send(this.CLA, ins, payloadType, p2, chunk, statusList)
+      const responseBuffer = await this.transport.send(this.CLA, ins, payloadType, p2, chunk, statusList)
+      return processResponse(responseBuffer, this.CUSTOM_APP_ERROR_DESCRIPTION)
     } catch (e) {
-      // In case transport.send send throws an Error, we still want our custom ResponseError
-      let statusCode: number = (e as any).statusCode || (e as any).returnCode
-      const buffer = Buffer.alloc(2)
-      buffer.writeUInt16BE(statusCode, 0)
+      // Extract status code from error
+      const statusCode: number = (e as any).statusCode || (e as any).returnCode || LedgerError.UnknownTransportError
+      const message = (e as any).message
+
+      // Create buffer based on whether error has a message
+      let buffer: Buffer
+      if (message?.length > 0) {
+        const messageBytes = Buffer.from(message, 'utf8')
+        buffer = Buffer.concat([messageBytes, Buffer.allocUnsafe(2)])
+        buffer.writeUInt16BE(statusCode, buffer.length - 2)
+      } else {
+        buffer = Buffer.allocUnsafe(2)
+        buffer.writeUInt16BE(statusCode, 0)
+      }
+
       return processResponse(buffer, this.CUSTOM_APP_ERROR_DESCRIPTION)
     }
-
-    return processResponse(responseBuffer, this.CUSTOM_APP_ERROR_DESCRIPTION)
   }
 
   /**

src/common.ts

@@ -58,8 +58,14 @@ export function processResponse(responseRaw: Buffer, customErrorList?: Record<Le
   }
 
   // Append additional error message from payload if available
+  // Avoid duplicating the error message if payload already contains it
   if (payload.length > 0) {
-    errorMessage += ` : ${payload.toString('ascii')}`
+    const payloadString = payload.toString('utf8')
+    if (!payloadString.includes(errorMessage)) {
+      errorMessage += ` : ${payloadString}`
+    } else {
+      errorMessage = payloadString
+    }
   }
 
   // Construct and throw an error object with details