Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions packages/node-runtime-worker-thread/src/worker-runtime.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {
MongoClientOptions,
ServiceProvider
} from '@mongosh/service-provider-core';
import { CliServiceProvider } from '@mongosh/service-provider-server';
import { CompassServiceProvider } from '@mongosh/service-provider-server';
import { exposeAll, createCaller } from './rpc';
import { serializeEvaluationResult } from './serializer';

Expand Down Expand Up @@ -43,8 +43,16 @@ export type WorkerRuntime = Runtime & {
};

const workerRuntime: WorkerRuntime = {
async init(uri, driverOptions = {}, cliOptions = {}) {
provider = await CliServiceProvider.connect(uri, driverOptions, cliOptions);
async init(
uri: string,
driverOptions: MongoClientOptions = {},
cliOptions: { nodb?: boolean } = {}
) {
provider = await CompassServiceProvider.connect(
uri,
driverOptions,
cliOptions
);
runtime = new ElectronRuntime(
provider /** , TODO: `messageBus` support for telemetry in a separate ticket */
);
Expand Down
3 changes: 2 additions & 1 deletion packages/service-provider-server/src/cli-service-provider.ts
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,7 @@ class CliServiceProvider extends ServiceProviderCore implements ServiceProvider
* @returns {Promise} The promise with cli service provider.
*/
static async connect(
this: typeof CliServiceProvider,
uri: string,
driverOptions: MongoClientOptions = {},
cliOptions: { nodb?: boolean } = {}
Expand All @@ -183,7 +184,7 @@ class CliServiceProvider extends ServiceProviderCore implements ServiceProvider
) :
new MongoClient(connectionString.toString(), clientOptions);

return new CliServiceProvider(mongoClient, clientOptions, connectionString);
return new this(mongoClient, clientOptions, connectionString);
}

public readonly platform: ReplPlatform;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import CliServiceProvider from '../cli-service-provider';
import { MongoClient, MongoClientOptions } from 'mongodb';
import { ConnectionString, ReplPlatform } from '@mongosh/service-provider-core';
import { MongoClient } from 'mongodb';
import { ConnectionString, ReplPlatform, MongoClientOptions } from '@mongosh/service-provider-core';

interface DataService {
client: {
Expand Down