Merge branch 'release/7.2.2'

Author: furey

README.md

@@ -112,18 +112,24 @@
 
 - [Overview](#other-features-overview)
 - [New Database Metadata](#other-features-new-database-metadata)
-- [MongoDB Version Compatibility](#other-features-mongodb-version-compatibility)
 
 #### Other Features: Overview
 
-MongoDB Lens includes several additional features:
-
-- **Configuration File**: Custom configuration via `~/.mongodb-lens.json`
-- **Connection Resilience**: Automatic reconnection with exponential backoff
-- **Component Disabling**: Selectively disable specific tools, prompts or resources
-- **JSONRPC Error Handling**: Comprehensive error handling with proper error codes
-- **Smart Caching**: Optimized caching for schemas, indexes, fields, collections and more
-- **Memory Management**: Automatic memory monitoring and cleanup for large operations
+MongoDB Lens includes numerous other features:
+
+- **[Config File](#configuration-config-file)**: Custom configuration via `~/.mongodb-lens.[jsonc|json]`
+- **[Env Var Overrides](#configuration-environment-variable-overrides)**: Override config settings via `process.env.CONFIG_*`
+- **[Confirmation System](#data-protection-confirmation-for-destructive-operations)**: Two-step verification for destructive operations
+- **[Multiple Connections](#configuration-multiple-mongodb-connections)**: Define and switch between named URI aliases
+- **[Component Disabling](#disabling-tools)**: Selectively disable tools, prompts or resources
+- **Connection Resilience**: Auto-reconnection with exponential backoff
+- **Query Safeguards**: Configurable limits and performance protections
+- **Error Handling**: Comprehensive JSONRPC error codes and messages
+- **Schema Inference**: Efficient schema analysis with intelligent sampling
+- **Credential Protection**: Connection string password obfuscation in logs
+- **Memory Management**: Auto-monitoring and cleanup for large operations
+- **Smart Caching**: Optimized caching for schema, indexes, fields and collections
+- **Backwards Compatible**: Support both modern and legacy MongoDB versions
 
 #### Other Features: New Database Metadata
 
@@ -172,10 +178,6 @@ Once you've added your own collections to your new database, you can safely remo
 - _"Drop the new database's metadata collection"_<br>
  <sup>➥ Uses `drop-collection` tool (with confirmation)</sup>
 
-#### Other Features: MongoDB Version Compatibility
-
-MongoDB Lens implements a backward compatibility layer to work reliably with both older MongoDB deployments and latest versions, providing consistent behavior without requiring version-specific configuration.
-
 ## Installation
 
 MongoDB Lens can be installed and run in several ways:

mongodb-lens.js

@@ -1877,8 +1877,8 @@ const registerTools = (server) => {
         streaming: createBooleanSchema('Enable streaming for large result sets', 'false')
       },
       async ({ collection, filter, projection, limit, skip, sort, streaming }) => {
-        try {
-          log(`Tool: Finding documents in collection '${collection}'…`)
+        return withErrorHandling(async () => {
+          log(`Tool: Finding documents in collection '${collection}'...`)
           log(`Tool: Using filter: ${filter}`)
           if (projection) log(`Tool: Using projection: ${projection}`)
           if (sort) log(`Tool: Using sort: ${sort}`)
@@ -1896,21 +1896,7 @@ const registerTools = (server) => {
               text: formatDocuments(documents, limit)
             }]
           }
-        } catch (error) {
-          log(`Error finding documents: ${error.message}`, true)
-          return {
-            content: [{
-              type: 'text',
-              text: `Error finding documents: ${error.message}`
-            }],
-            isError: true,
-            error: {
-              code: JSONRPC_ERROR_CODES.MONGODB_QUERY_ERROR,
-              message: error.message,
-              data: { type: error.name }
-            }
-          }
-        }
+        }, `Error finding documents in collection '${collection}'`)
       }
     )
   }
@@ -2074,8 +2060,8 @@ const registerTools = (server) => {
         limit: z.number().int().min(1).default(1000).describe('Maximum number of results to return when streaming')
       },
       async ({ collection, pipeline, streaming, limit }) => {
-        try {
-          log(`Tool: Running aggregation on collection '${collection}'…`)
+        return withErrorHandling(async () => {
+          log(`Tool: Running aggregation on collection '${collection}'...`)
           log(`Tool: Using pipeline: ${pipeline}`)
           log(`Tool: Streaming: ${streaming}, Limit: ${limit}`)
 
@@ -2090,21 +2076,7 @@ const registerTools = (server) => {
               text: formatDocuments(results, 100)
             }]
           }
-        } catch (error) {
-          log(`Error running aggregation: ${error.message}`, true)
-          return {
-            content: [{
-              type: 'text',
-              text: `Error running aggregation: ${error.message}`
-            }],
-            isError: true,
-            error: {
-              code: JSONRPC_ERROR_CODES.MONGODB_QUERY_ERROR,
-              message: error.message,
-              data: { type: error.name }
-            }
-          }
-        }
+        }, `Error running aggregation on collection '${collection}'`)
       }
     )
   }
@@ -3144,17 +3116,36 @@ const withErrorHandling = async (operation, errorMessage, defaultValue = null) =
     log(formattedError, true)
 
     let errorCode = JSONRPC_ERROR_CODES.SERVER_ERROR_START
+    let errorType = error.name || 'Error'
 
     if (error.name === 'MongoError' || error.name === 'MongoServerError') {
-      if (error.code === 13) errorCode = JSONRPC_ERROR_CODES.RESOURCE_ACCESS_DENIED
-      else if (error.code === 59 || error.code === 61) errorCode = JSONRPC_ERROR_CODES.MONGODB_CONNECTION_ERROR
-      else if (error.code === 121) errorCode = JSONRPC_ERROR_CODES.MONGODB_SCHEMA_ERROR
-      else errorCode = JSONRPC_ERROR_CODES.MONGODB_QUERY_ERROR
-    } else if (error.message.includes('not found') || error.message.includes('does not exist')) {
+      switch(error.code) {
+        case 13:
+          errorCode = JSONRPC_ERROR_CODES.RESOURCE_ACCESS_DENIED; break
+        case 59: case 61:
+          errorCode = JSONRPC_ERROR_CODES.MONGODB_CONNECTION_ERROR; break
+        case 121:
+          errorCode = JSONRPC_ERROR_CODES.MONGODB_SCHEMA_ERROR; break
+        case 11000:
+          errorCode = JSONRPC_ERROR_CODES.MONGODB_DUPLICATE_KEY; break
+        case 112: case 16500:
+          errorCode = JSONRPC_ERROR_CODES.MONGODB_WRITE_ERROR; break
+        case 50: case 57:
+          errorCode = JSONRPC_ERROR_CODES.MONGODB_TIMEOUT_ERROR; break
+        default:
+          errorCode = JSONRPC_ERROR_CODES.MONGODB_QUERY_ERROR
+      }
+    } else if (error.message.match(/not found|does not exist|cannot find/i)) {
       errorCode = JSONRPC_ERROR_CODES.RESOURCE_NOT_FOUND
+    } else if (error.message.match(/already exists|duplicate/i)) {
+      errorCode = JSONRPC_ERROR_CODES.RESOURCE_ALREADY_EXISTS
+    } else if (error.message.match(/permission|access denied|unauthorized/i)) {
+      errorCode = JSONRPC_ERROR_CODES.RESOURCE_ACCESS_DENIED
+    } else if (error.message.match(/timeout|timed out/i)) {
+      errorCode = JSONRPC_ERROR_CODES.MONGODB_TIMEOUT_ERROR
     }
 
-    const errorResponse = {
+    return {
       content: [{
         type: 'text',
         text: formattedError
@@ -3163,11 +3154,12 @@ const withErrorHandling = async (operation, errorMessage, defaultValue = null) =
       error: {
         code: errorCode,
         message: error.message,
-        data: { type: error.name }
+        data: {
+          type: errorType,
+          details: error.code ? `MongoDB error code: ${error.code}` : undefined
+        }
       }
     }
-
-    return errorResponse
   }
 }
 
@@ -6007,18 +5999,26 @@ const confirmationTokens = {
 }
 
 const JSONRPC_ERROR_CODES = {
+  // Standard JSON-RPC error codes (keep for compatibility)
   PARSE_ERROR: -32700,
   INVALID_REQUEST: -32600,
   METHOD_NOT_FOUND: -32601,
   INVALID_PARAMS: -32602,
   INTERNAL_ERROR: -32603,
   SERVER_ERROR_START: -32000,
-  SERVER_ERROR_END: -32099,
+
+  // MongoDB-specific error codes (expanded)
   MONGODB_CONNECTION_ERROR: -32050,
   MONGODB_QUERY_ERROR: -32051,
   MONGODB_SCHEMA_ERROR: -32052,
+  MONGODB_WRITE_ERROR: -32053,
+  MONGODB_DUPLICATE_KEY: -32054,
+  MONGODB_TIMEOUT_ERROR: -32055,
+
+  // Resource-related error codes
   RESOURCE_NOT_FOUND: -32040,
-  RESOURCE_ACCESS_DENIED: -32041
+  RESOURCE_ACCESS_DENIED: -32041,
+  RESOURCE_ALREADY_EXISTS: -32042
 }
 
 const instructions = `

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "mongodb-lens",
-  "version": "7.2.1",
+  "version": "7.2.2",
   "author": "James Furey (https://about.me/jamesfurey)",
   "description": "MongoDB Lens: Full Featured MCP Server for MongoDB Databases",
   "license": "MIT",