add awaits

nirinchev · nirinchev · commit 8e18b975e904 · 2025-04-10T22:07:09.000+02:00
diff --git a/src/tools/mongodb/collectionIndexes.ts b/src/tools/mongodb/collectionIndexes.ts
@@ -9,7 +9,7 @@ export class CollectionIndexesTool extends MongoDBToolBase {
     protected operationType: DbOperationType = "read";
 
     protected async execute({ database, collection }: ToolArgs<typeof DbOperationArgs>): Promise<CallToolResult> {
-        const provider = this.ensureConnected();
+        const provider = await this.ensureConnected();
         const indexes = await provider.getIndexes(database, collection);
 
         return {
diff --git a/src/tools/mongodb/connect.ts b/src/tools/mongodb/connect.ts
@@ -1,6 +1,5 @@
 import { z } from "zod";
 import { CallToolResult } from "@modelcontextprotocol/sdk/types.js";
-import { NodeDriverServiceProvider } from "@mongosh/service-provider-node-driver";
 import { DbOperationType, MongoDBToolBase } from "./mongodbTool.js";
 import { ToolArgs } from "../tool.js";
 import { ErrorCodes, MongoDBError } from "../../errors.js";
diff --git a/src/tools/mongodb/create/insertMany.ts b/src/tools/mongodb/create/insertMany.ts
@@ -21,7 +21,7 @@ export class InsertManyTool extends MongoDBToolBase {
         collection,
         documents,
     }: ToolArgs<typeof this.argsShape>): Promise<CallToolResult> {
-        const provider = this.ensureConnected();
+        const provider = await this.ensureConnected();
         const result = await provider.insertMany(database, collection, documents);
 
         return {
diff --git a/src/tools/mongodb/create/insertOne.ts b/src/tools/mongodb/create/insertOne.ts
@@ -23,7 +23,7 @@ export class InsertOneTool extends MongoDBToolBase {
         collection,
         document,
     }: ToolArgs<typeof this.argsShape>): Promise<CallToolResult> {
-        const provider = this.ensureConnected();
+        const provider = await this.ensureConnected();
         const result = await provider.insertOne(database, collection, document);
 
         return {
diff --git a/src/tools/mongodb/createIndex.ts b/src/tools/mongodb/createIndex.ts
@@ -15,7 +15,7 @@ export class CreateIndexTool extends MongoDBToolBase {
     protected operationType: DbOperationType = "create";
 
     protected async execute({ database, collection, keys }: ToolArgs<typeof this.argsShape>): Promise<CallToolResult> {
-        const provider = this.ensureConnected();
+        const provider = await this.ensureConnected();
         const indexes = await provider.createIndexes(database, collection, [
             {
                 key: keys,
diff --git a/src/tools/mongodb/delete/deleteMany.ts b/src/tools/mongodb/delete/deleteMany.ts
@@ -23,7 +23,7 @@ export class DeleteManyTool extends MongoDBToolBase {
         collection,
         filter,
     }: ToolArgs<typeof this.argsShape>): Promise<CallToolResult> {
-        const provider = this.ensureConnected();
+        const provider = await this.ensureConnected();
         const result = await provider.deleteMany(database, collection, filter);
 
         return {
diff --git a/src/tools/mongodb/delete/deleteOne.ts b/src/tools/mongodb/delete/deleteOne.ts
@@ -23,7 +23,7 @@ export class DeleteOneTool extends MongoDBToolBase {
         collection,
         filter,
     }: ToolArgs<typeof this.argsShape>): Promise<CallToolResult> {
-        const provider = this.ensureConnected();
+        const provider = await this.ensureConnected();
         const result = await provider.deleteOne(database, collection, filter);
 
         return {
diff --git a/src/tools/mongodb/delete/dropCollection.ts b/src/tools/mongodb/delete/dropCollection.ts
@@ -12,7 +12,7 @@ export class DropCollectionTool extends MongoDBToolBase {
     protected operationType: DbOperationType = "delete";
 
     protected async execute({ database, collection }: ToolArgs<typeof this.argsShape>): Promise<CallToolResult> {
-        const provider = this.ensureConnected();
+        const provider = await this.ensureConnected();
         const result = await provider.dropCollection(database, collection);
 
         return {
diff --git a/src/tools/mongodb/delete/dropDatabase.ts b/src/tools/mongodb/delete/dropDatabase.ts
@@ -11,7 +11,7 @@ export class DropDatabaseTool extends MongoDBToolBase {
     protected operationType: DbOperationType = "delete";
 
     protected async execute({ database }: ToolArgs<typeof this.argsShape>): Promise<CallToolResult> {
-        const provider = this.ensureConnected();
+        const provider = await this.ensureConnected();
         const result = await provider.dropDatabase(database);
 
         return {
diff --git a/src/tools/mongodb/metadata/collectionSchema.ts b/src/tools/mongodb/metadata/collectionSchema.ts
@@ -11,7 +11,7 @@ export class CollectionSchemaTool extends MongoDBToolBase {
     protected operationType: DbOperationType = "metadata";
 
     protected async execute({ database, collection }: ToolArgs<typeof DbOperationArgs>): Promise<CallToolResult> {
-        const provider = this.ensureConnected();
+        const provider = await this.ensureConnected();
         const documents = await provider.find(database, collection, {}, { limit: 5 }).toArray();
         const schema = await parseSchema(documents);
 
diff --git a/src/tools/mongodb/metadata/collectionStorageSize.ts b/src/tools/mongodb/metadata/collectionStorageSize.ts
@@ -10,7 +10,7 @@ export class CollectionStorageSizeTool extends MongoDBToolBase {
     protected operationType: DbOperationType = "metadata";
 
     protected async execute({ database, collection }: ToolArgs<typeof DbOperationArgs>): Promise<CallToolResult> {
-        const provider = this.ensureConnected();
+        const provider = await this.ensureConnected();
         const [{ value }] = await provider
             .aggregate(database, collection, [
                 { $collStats: { storageStats: {} } },
diff --git a/src/tools/mongodb/metadata/dbStats.ts b/src/tools/mongodb/metadata/dbStats.ts
@@ -12,7 +12,7 @@ export class DbStatsTool extends MongoDBToolBase {
     protected operationType: DbOperationType = "metadata";
 
     protected async execute({ database }: ToolArgs<typeof this.argsShape>): Promise<CallToolResult> {
-        const provider = this.ensureConnected();
+        const provider = await this.ensureConnected();
         const result = await provider.runCommandWithCheck(database, {
             dbStats: 1,
             scale: 1,
diff --git a/src/tools/mongodb/metadata/listCollections.ts b/src/tools/mongodb/metadata/listCollections.ts
@@ -12,7 +12,7 @@ export class ListCollectionsTool extends MongoDBToolBase {
     protected operationType: DbOperationType = "metadata";
 
     protected async execute({ database }: ToolArgs<typeof this.argsShape>): Promise<CallToolResult> {
-        const provider = this.ensureConnected();
+        const provider = await this.ensureConnected();
         const collections = await provider.listCollections(database);
 
         return {
diff --git a/src/tools/mongodb/metadata/listDatabases.ts b/src/tools/mongodb/metadata/listDatabases.ts
@@ -10,7 +10,7 @@ export class ListDatabasesTool extends MongoDBToolBase {
     protected operationType: DbOperationType = "metadata";
 
     protected async execute(): Promise<CallToolResult> {
-        const provider = this.ensureConnected();
+        const provider = await this.ensureConnected();
         const dbs = (await provider.listDatabases("")).databases as { name: string; sizeOnDisk: bson.Long }[];
 
         return {
diff --git a/src/tools/mongodb/read/aggregate.ts b/src/tools/mongodb/read/aggregate.ts
@@ -19,7 +19,7 @@ export class AggregateTool extends MongoDBToolBase {
         collection,
         pipeline,
     }: ToolArgs<typeof this.argsShape>): Promise<CallToolResult> {
-        const provider = this.ensureConnected();
+        const provider = await this.ensureConnected();
         const documents = await provider.aggregate(database, collection, pipeline).toArray();
 
         const content: Array<{ text: string; type: "text" }> = [
diff --git a/src/tools/mongodb/read/count.ts b/src/tools/mongodb/read/count.ts
@@ -20,7 +20,7 @@ export class CountTool extends MongoDBToolBase {
     protected operationType: DbOperationType = "metadata";
 
     protected async execute({ database, collection, query }: ToolArgs<typeof this.argsShape>): Promise<CallToolResult> {
-        const provider = this.ensureConnected();
+        const provider = await this.ensureConnected();
         const count = await provider.count(database, collection, query);
 
         return {
diff --git a/src/tools/mongodb/read/find.ts b/src/tools/mongodb/read/find.ts
@@ -38,7 +38,7 @@ export class FindTool extends MongoDBToolBase {
         limit,
         sort,
     }: ToolArgs<typeof this.argsShape>): Promise<CallToolResult> {
-        const provider = this.ensureConnected();
+        const provider = await this.ensureConnected();
         const documents = await provider.find(database, collection, filter, { projection, limit, sort }).toArray();
 
         const content: Array<{ text: string; type: "text" }> = [
diff --git a/src/tools/mongodb/update/renameCollection.ts b/src/tools/mongodb/update/renameCollection.ts
@@ -20,7 +20,7 @@ export class RenameCollectionTool extends MongoDBToolBase {
         newName,
         dropTarget,
     }: ToolArgs<typeof this.argsShape>): Promise<CallToolResult> {
-        const provider = this.ensureConnected();
+        const provider = await this.ensureConnected();
         const result = await provider.renameCollection(database, collection, newName, {
             dropTarget,
         });
diff --git a/src/tools/mongodb/update/updateMany.ts b/src/tools/mongodb/update/updateMany.ts
@@ -35,7 +35,7 @@ export class UpdateManyTool extends MongoDBToolBase {
         update,
         upsert,
     }: ToolArgs<typeof this.argsShape>): Promise<CallToolResult> {
-        const provider = this.ensureConnected();
+        const provider = await this.ensureConnected();
         const result = await provider.updateMany(database, collection, filter, update, {
             upsert,
         });
diff --git a/src/tools/mongodb/update/updateOne.ts b/src/tools/mongodb/update/updateOne.ts
@@ -35,7 +35,7 @@ export class UpdateOneTool extends MongoDBToolBase {
         update,
         upsert,
     }: ToolArgs<typeof this.argsShape>): Promise<CallToolResult> {
-        const provider = this.ensureConnected();
+        const provider = await this.ensureConnected();
         const result = await provider.updateOne(database, collection, filter, update, {
             upsert,
         });

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ export class CreateIndexTool extends MongoDBToolBase {`
`15`	`15`	`protected operationType: DbOperationType = "create";`
`16`	`16`
`17`	`17`	`protected async execute({ database, collection, keys }: ToolArgs<typeof this.argsShape>): Promise<CallToolResult> {`
`18`		`- const provider = this.ensureConnected();`
	`18`	`+ const provider = await this.ensureConnected();`
`19`	`19`	`const indexes = await provider.createIndexes(database, collection, [`
`20`	`20`	`{`
`21`	`21`	`key: keys,`