mongodb-data-service 21.10.0 → 21.14.0

package/README.md

@@ -1,6 +1,6 @@
 # mongodb-data-service [![][workflow_img]][workflow_url] [![][npm_img]][npm_url] [![][dependabot_img]][dependabot_url]
 
-> MongoDB Data Service: an API on top of (currently) the [MongoDB Node Driver][driver] and (some day) [mongodb-scope-client][scope-client].
+> MongoDB Data Service: an API on top of the [MongoDB Node Driver][driver]
 
 ## Installation
 
@@ -10,28 +10,16 @@ npm install --save mongodb-data-service
 
 ## Usage
 
-### Instantiating the service.
+### Creating a new service instance
 
 ```javascript
-const Connection = require('mongodb-connection-model');
-const DataService = require('mongodb-data-service');
-
-var service = new DataService(
-  new Connection({
-    hostname: '127.0.0.1',
-    port: 27018,
-    ns: 'data-service',
-  })
-);
-```
-
-### Connecting to the server.
+const { connect } = require('mongodb-data-service');
 
-Once the service is ready, it will also emit a `readable` event.
+// ...
 
-```javascript
-service.connect((err) => assert.equal(null, err)})
-  .on('readable', () => console.log('Connected!'));
+const service = await connect({
+  driverUrl: 'mongodb://localhost:27018/data-service',
+});
 ```
 
 ### API
@@ -148,13 +136,10 @@ service.sample('database.collection', {});
 npm test
 ```
 
-All tests in an electron renderer process thanks to [electron-mocha](https://npm.im/electron-mocha).
-
 [workflow_img]: https://github.com/mongodb-js/data-service/workflows/Check%20and%20Test/badge.svg?event=push
 [workflow_url]: https://github.com/mongodb-js/data-service/actions?query=workflow%3A%22Check+and+Test%22
 [npm_img]: https://img.shields.io/npm/v/mongodb-data-service.svg?style=flat-square
 [npm_url]: https://www.npmjs.org/package/mongodb-data-service
-[scope-client]: https://github.com/mongodb-js/scope-client
 [driver]: https://github.com/mongodb/node-mongodb-native
 [dependabot_img]: https://api.dependabot.com/badges/status?host=github&repo=mongodb-js/data-service
 [dependabot_url]: https://app.dependabot.com/accounts/mongodb-js/repos/51536401

package/lib/connect-mongo-client.d.ts

@@ -0,0 +1,11 @@
+import { MongoClientOptions, MongoClient } from 'mongodb';
+import SSHTunnel from '@mongodb-js/ssh-tunnel';
+import { ConnectionOptions } from './connection-options';
+export default function connectMongoClient(connectionOptions: ConnectionOptions, setupListeners: (client: MongoClient) => void, tunnelLocalPort: number): Promise<[
+    MongoClient,
+    SSHTunnel | undefined,
+    {
+        url: string;
+        options: MongoClientOptions;
+    }
+]>;

package/lib/connect-mongo-client.js

@@ -0,0 +1,88 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const mongodb_1 = require("mongodb");
+const mongodb_connection_string_url_1 = __importDefault(require("mongodb-connection-string-url"));
+const resolve_mongodb_srv_1 = __importDefault(require("resolve-mongodb-srv"));
+const redact_1 = require("./redact");
+const compass_logging_1 = __importDefault(require("@mongodb-js/compass-logging"));
+const ssh_tunnel_1 = require("./ssh-tunnel");
+const { debug, log, mongoLogId } = compass_logging_1.default('COMPASS-CONNECT');
+async function connectMongoClient(connectionOptions, setupListeners, tunnelLocalPort) {
+    var _a, _b;
+    debug('connectMongoClient invoked', redact_1.redactConnectionOptions(connectionOptions));
+    const [driverUrl, driverOptions] = connectionOptionsToMongoClientParams(connectionOptions);
+    const srvResolvedUrl = await resolveSrvRecord(driverUrl);
+    const [tunnel, urlWithSshTunnel] = await ssh_tunnel_1.openSshTunnel(srvResolvedUrl, connectionOptions.sshTunnel, tunnelLocalPort);
+    log.info(mongoLogId(1001000009), 'Connect', 'Initiating connection', {
+        url: redact_1.redactConnectionString(urlWithSshTunnel),
+        options: driverOptions,
+    });
+    const mongoClient = new mongodb_1.MongoClient(urlWithSshTunnel, driverOptions);
+    if (setupListeners) {
+        setupListeners(mongoClient);
+    }
+    try {
+        debug('waiting for MongoClient to connect ...');
+        await Promise.race([
+            (async () => {
+                await mongoClient.connect();
+                await mongoClient.db('admin').command({ ping: 1 });
+            })(),
+            ssh_tunnel_1.waitForTunnelError(tunnel),
+        ]);
+        log.info(mongoLogId(1001000012), 'Connect', 'Connection established', {
+            driver: (_b = (_a = mongoClient.options) === null || _a === void 0 ? void 0 : _a.metadata) === null || _b === void 0 ? void 0 : _b.driver,
+            url: redact_1.redactConnectionString(urlWithSshTunnel),
+        });
+        return [
+            mongoClient,
+            tunnel,
+            { url: urlWithSshTunnel, options: driverOptions },
+        ];
+    }
+    catch (err) {
+        log.error(mongoLogId(1001000013), 'Connect', 'Connection attempt failed', { error: err.message });
+        debug('connection error', err);
+        debug('force shutting down ssh tunnel ...');
+        await Promise.all([ssh_tunnel_1.forceCloseTunnel(tunnel), mongoClient.close()]).catch(() => {
+        });
+        throw err;
+    }
+}
+exports.default = connectMongoClient;
+function connectionOptionsToMongoClientParams(connectionOptions) {
+    const url = new mongodb_connection_string_url_1.default(connectionOptions.connectionString);
+    const options = {
+        monitorCommands: true,
+    };
+    const isLoadBalanced = url.searchParams.get('loadBalanced') === 'true';
+    const isReplicaSet = url.isSRV || url.hosts.length > 1 || url.searchParams.has('replicaSet');
+    const hasDirectConnection = url.searchParams.has('directConnection');
+    if (!isReplicaSet && !isLoadBalanced && !hasDirectConnection) {
+        url.searchParams.set('directConnection', 'true');
+    }
+    if (!url.searchParams.has('tlsCertificateFile') &&
+        url.searchParams.has('tlsCertificateKeyFile')) {
+        url.searchParams.set('tlsCertificateFile', url.searchParams.get('tlsCertificateKeyFile'));
+    }
+    return [url.href, options];
+}
+async function resolveSrvRecord(url) {
+    let resolvedUrl;
+    try {
+        resolvedUrl = await resolve_mongodb_srv_1.default(url);
+        log.info(mongoLogId(1001000010), 'Connect', 'Resolved SRV record', {
+            from: redact_1.redactConnectionString(url),
+            to: redact_1.redactConnectionString(resolvedUrl),
+        });
+    }
+    catch (error) {
+        log.error(mongoLogId(1001000011), 'Connect', 'Resolving SRV record failed', { from: redact_1.redactConnectionString(url), error: error.message });
+        throw error;
+    }
+    return resolvedUrl;
+}
+//# sourceMappingURL=connect-mongo-client.js.map

package/lib/connect-mongo-client.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"connect-mongo-client.js","sourceRoot":"","sources":["../src/connect-mongo-client.ts"],"names":[],"mappings":"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"}

package/lib/connect.js

@@ -3,23 +3,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const util_1 = __importDefault(require("util"));
 const data_service_1 = __importDefault(require("./data-service"));
-const ConnectionModel = require('mongodb-connection-model');
-const connectionFromUri = util_1.default.promisify(ConnectionModel.from.bind(ConnectionModel));
 async function connect(connectionOptions) {
-    const connectionModel = await connectionFromUri(connectionOptions.connectionString);
-    if (!connectionOptions.sshTunnel) {
-        connectionModel.sshTunnel = 'NONE';
-    }
-    else if (connectionOptions.sshTunnel.password) {
-        connectionModel.sshTunnel = 'USER_PASSWORD';
-    }
-    else if (connectionOptions.sshTunnel.privateKeyFile) {
-        connectionModel.sshTunnel = 'IDENTITY_FILE';
-    }
-    const dataService = new data_service_1.default(connectionModel);
-    await util_1.default.promisify(dataService.connect.bind(dataService))();
+    const dataService = new data_service_1.default(connectionOptions);
+    await dataService.connect();
     return dataService;
 }
 exports.default = connect;

package/lib/connect.js.map

@@ -1 +1 @@
-{"version":3,"file":"connect.js","sourceRoot":"","sources":["../src/connect.ts"],"names":[],"mappings":";;;;;AAAA,gDAAwB;AAGxB,kEAAyC;AAIzC,MAAM,eAAe,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAAC;AAE5D,MAAM,iBAAiB,GAAG,cAAI,CAAC,SAAS,CACtC,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,CAC3C,CAAC;AAEa,KAAK,UAAU,OAAO,CACnC,iBAAoC;IAEpC,MAAM,eAAe,GAA0B,MAAM,iBAAiB,CACpE,iBAAiB,CAAC,gBAAgB,CACnC,CAAC;IAEF,IAAI,CAAC,iBAAiB,CAAC,SAAS,EAAE;QAChC,eAAe,CAAC,SAAS,GAAG,MAAM,CAAC;KACpC;SAAM,IAAI,iBAAiB,CAAC,SAAS,CAAC,QAAQ,EAAE;QAC/C,eAAe,CAAC,SAAS,GAAG,eAAe,CAAC;KAC7C;SAAM,IAAI,iBAAiB,CAAC,SAAS,CAAC,cAAc,EAAE;QACrD,eAAe,CAAC,SAAS,GAAG,eAAe,CAAC;KAC7C;IAED,MAAM,WAAW,GAAG,IAAI,sBAAW,CAAC,eAAe,CAAC,CAAC;IAErD,MAAM,cAAI,CAAC,SAAS,CAAC,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,EAAE,CAAC;IAE9D,OAAO,WAAW,CAAC;AACrB,CAAC;AApBD,0BAoBC"}
+{"version":3,"file":"connect.js","sourceRoot":"","sources":["../src/connect.ts"],"names":[],"mappings":";;;;;AACA,kEAAyC;AAE1B,KAAK,UAAU,OAAO,CACnC,iBAAoC;IAEpC,MAAM,WAAW,GAAG,IAAI,sBAAW,CAAC,iBAAiB,CAAC,CAAC;IACvD,MAAM,WAAW,CAAC,OAAO,EAAE,CAAC;IAC5B,OAAO,WAAW,CAAC;AACrB,CAAC;AAND,0BAMC"}

package/lib/connection-info.d.ts

@@ -0,0 +1,12 @@
+import { ConnectionOptions } from './connection-options';
+export interface ConnectionInfo {
+    readonly id: string;
+    lastUsed?: Date;
+    favorite?: ConnectionFavoriteOptions;
+    connectionOptions: ConnectionOptions;
+}
+interface ConnectionFavoriteOptions {
+    name: string;
+    color?: string;
+}
+export {};

package/lib/connection-info.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=connection-info.js.map

package/lib/connection-info.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"connection-info.js","sourceRoot":"","sources":["../src/connection-info.ts"],"names":[],"mappings":""}

package/lib/connection-options.d.ts

@@ -1,20 +1,12 @@
 export interface ConnectionOptions {
-    readonly id?: string;
-    lastUsed?: Date;
     connectionString: string;
     sshTunnel?: ConnectionSshOptions;
-    favorite?: ConnectionFavoriteOptions;
 }
 export interface ConnectionSshOptions {
     host: string;
     port: number;
     username: string;
     password?: string;
-    privateKeyFile?: string;
-    privateKeyPassphrase?: string;
+    identityKeyFile?: string;
+    identityKeyPassphrase?: string;
 }
-interface ConnectionFavoriteOptions {
-    name: string;
-    color?: string;
-}
-export {};

package/lib/connection-secrets.d.ts

@@ -0,0 +1,13 @@
+import { ConnectionInfo } from './connection-info';
+export interface ConnectionSecrets {
+    password?: string;
+    sshTunnelPassphrase?: string;
+    awsSessionToken?: string;
+    tlsCertificateKeyFilePassword?: string;
+    proxyPassword?: string;
+}
+export declare function mergeSecrets(connectionInfo: Readonly<ConnectionInfo>, secrets: ConnectionSecrets | undefined): ConnectionInfo;
+export declare function extractSecrets(connectionInfo: Readonly<ConnectionInfo>): {
+    connectionInfo: ConnectionInfo;
+    secrets: ConnectionSecrets;
+};

package/lib/connection-secrets.js

@@ -0,0 +1,96 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.extractSecrets = exports.mergeSecrets = void 0;
+const lodash_1 = __importDefault(require("lodash"));
+const mongodb_connection_string_url_1 = __importStar(require("mongodb-connection-string-url"));
+function mergeSecrets(connectionInfo, secrets) {
+    const connectionInfoWithSecrets = lodash_1.default.cloneDeep(connectionInfo);
+    if (!secrets) {
+        return connectionInfoWithSecrets;
+    }
+    const connectionOptions = connectionInfoWithSecrets.connectionOptions;
+    const uri = new mongodb_connection_string_url_1.default(connectionOptions.connectionString);
+    if (secrets.password) {
+        uri.password = secrets.password;
+    }
+    if (secrets.sshTunnelPassphrase && connectionOptions.sshTunnel) {
+        connectionOptions.sshTunnel.identityKeyPassphrase =
+            secrets.sshTunnelPassphrase;
+    }
+    if (secrets.tlsCertificateKeyFilePassword) {
+        uri.searchParams.set('tlsCertificateKeyFilePassword', secrets.tlsCertificateKeyFilePassword);
+    }
+    if (secrets.proxyPassword) {
+        uri.searchParams.set('proxyPassword', secrets.proxyPassword);
+    }
+    if (secrets.awsSessionToken) {
+        const authMechanismProperties = new mongodb_connection_string_url_1.CommaAndColonSeparatedRecord(uri.searchParams.get('authMechanismProperties'));
+        authMechanismProperties.set('AWS_SESSION_TOKEN', secrets.awsSessionToken);
+        uri.searchParams.set('authMechanismProperties', authMechanismProperties.toString());
+    }
+    connectionInfoWithSecrets.connectionOptions.connectionString = uri.href;
+    return connectionInfoWithSecrets;
+}
+exports.mergeSecrets = mergeSecrets;
+function extractSecrets(connectionInfo) {
+    var _a;
+    const connectionInfoWithoutSecrets = lodash_1.default.cloneDeep(connectionInfo);
+    const secrets = {};
+    const connectionOptions = connectionInfoWithoutSecrets.connectionOptions;
+    const uri = new mongodb_connection_string_url_1.default(connectionOptions.connectionString);
+    if (uri.password) {
+        secrets.password = uri.password;
+        uri.password = '';
+    }
+    if ((_a = connectionOptions.sshTunnel) === null || _a === void 0 ? void 0 : _a.identityKeyPassphrase) {
+        secrets.sshTunnelPassphrase =
+            connectionOptions.sshTunnel.identityKeyPassphrase;
+        delete connectionOptions.sshTunnel.identityKeyPassphrase;
+    }
+    if (uri.searchParams.has('tlsCertificateKeyFilePassword')) {
+        secrets.tlsCertificateKeyFilePassword =
+            uri.searchParams.get('tlsCertificateKeyFilePassword') || undefined;
+        uri.searchParams.delete('tlsCertificateKeyFilePassword');
+    }
+    if (uri.searchParams.has('proxyPassword')) {
+        secrets.proxyPassword = uri.searchParams.get('proxyPassword') || undefined;
+        uri.searchParams.delete('proxyPassword');
+    }
+    const authMechanismProperties = new mongodb_connection_string_url_1.CommaAndColonSeparatedRecord(uri.searchParams.get('authMechanismProperties'));
+    if (authMechanismProperties.has('AWS_SESSION_TOKEN')) {
+        secrets.awsSessionToken = authMechanismProperties.get('AWS_SESSION_TOKEN');
+        authMechanismProperties.delete('AWS_SESSION_TOKEN');
+        if (authMechanismProperties.toString()) {
+            uri.searchParams.set('authMechanismProperties', authMechanismProperties.toString());
+        }
+        else {
+            uri.searchParams.delete('authMechanismProperties');
+        }
+    }
+    connectionInfoWithoutSecrets.connectionOptions.connectionString = uri.href;
+    return { connectionInfo: connectionInfoWithoutSecrets, secrets };
+}
+exports.extractSecrets = extractSecrets;
+//# sourceMappingURL=connection-secrets.js.map

package/lib/connection-secrets.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"connection-secrets.js","sourceRoot":"","sources":["../src/connection-secrets.ts"],"names":[],"mappings":"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"}

package/lib/connection-storage.d.ts

@@ -0,0 +1,6 @@
+import { ConnectionInfo } from './connection-info';
+export declare class ConnectionStorage {
+    loadAll(): Promise<ConnectionInfo[]>;
+    save(connectionInfo: ConnectionInfo): Promise<void>;
+    delete(connectionOptions: ConnectionInfo): Promise<void>;
+}

package/lib/connection-storage.js

@@ -0,0 +1,45 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ConnectionStorage = void 0;
+const uuid_1 = require("uuid");
+const legacy_connection_model_1 = require("./legacy/legacy-connection-model");
+class ConnectionStorage {
+    async loadAll() {
+        const { ConnectionCollection } = require('mongodb-connection-model');
+        const connectionCollection = new ConnectionCollection();
+        const fetchConnectionModels = promisifyAmpersandMethod(connectionCollection.fetch.bind(connectionCollection));
+        await fetchConnectionModels();
+        return connectionCollection.map(legacy_connection_model_1.convertConnectionModelToInfo);
+    }
+    async save(connectionInfo) {
+        if (!connectionInfo.id) {
+            throw new Error('id is required');
+        }
+        if (!uuid_1.validate(connectionInfo.id)) {
+            throw new Error('id must be a uuid');
+        }
+        const model = await legacy_connection_model_1.convertConnectionInfoToModel(connectionInfo);
+        model.save();
+    }
+    async delete(connectionOptions) {
+        if (!connectionOptions.id) {
+            return;
+        }
+        const model = await legacy_connection_model_1.convertConnectionInfoToModel(connectionOptions);
+        model.destroy();
+    }
+}
+exports.ConnectionStorage = ConnectionStorage;
+function promisifyAmpersandMethod(fn) {
+    return () => new Promise((resolve, reject) => {
+        fn({
+            success: (model) => {
+                resolve(model);
+            },
+            error: (model, error) => {
+                reject(error);
+            },
+        });
+    });
+}
+//# sourceMappingURL=connection-storage.js.map

package/lib/connection-storage.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"connection-storage.js","sourceRoot":"","sources":["../src/connection-storage.ts"],"names":[],"mappings":";;;AAEA,+BAAgD;AAChD,8EAI0C;AAE1C,MAAa,iBAAiB;IAM5B,KAAK,CAAC,OAAO;QAEX,MAAM,EAAE,oBAAoB,EAAE,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAAC;QACrE,MAAM,oBAAoB,GAAG,IAAI,oBAAoB,EAAE,CAAC;QACxD,MAAM,qBAAqB,GAAG,wBAAwB,CACpD,oBAAoB,CAAC,KAAK,CAAC,IAAI,CAAC,oBAAoB,CAAC,CACtD,CAAC;QAEF,MAAM,qBAAqB,EAAE,CAAC;QAC9B,OAAO,oBAAoB,CAAC,GAAG,CAAC,sDAA4B,CAAC,CAAC;IAChE,CAAC;IAUD,KAAK,CAAC,IAAI,CAAC,cAA8B;QACvC,IAAI,CAAC,cAAc,CAAC,EAAE,EAAE;YACtB,MAAM,IAAI,KAAK,CAAC,gBAAgB,CAAC,CAAC;SACnC;QAED,IAAI,CAAC,eAAY,CAAC,cAAc,CAAC,EAAE,CAAC,EAAE;YACpC,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC;SACtC;QAED,MAAM,KAAK,GAAG,MAAM,sDAA4B,CAAC,cAAc,CAAC,CAAC;QACjE,KAAK,CAAC,IAAI,EAAE,CAAC;IACf,CAAC;IAaD,KAAK,CAAC,MAAM,CAAC,iBAAiC;QAC5C,IAAI,CAAC,iBAAiB,CAAC,EAAE,EAAE;YAGzB,OAAO;SACR;QAED,MAAM,KAAK,GAAG,MAAM,sDAA4B,CAAC,iBAAiB,CAAC,CAAC;QACpE,KAAK,CAAC,OAAO,EAAE,CAAC;IAClB,CAAC;CACF;AA5DD,8CA4DC;AAED,SAAS,wBAAwB,CAC/B,EAAgD;IAEhD,OAAO,GAAG,EAAE,CACV,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QAC9B,EAAE,CAAC;YACD,OAAO,EAAE,CAAC,KAAQ,EAAE,EAAE;gBACpB,OAAO,CAAC,KAAK,CAAC,CAAC;YACjB,CAAC;YACD,KAAK,EAAE,CAAC,KAAQ,EAAE,KAAY,EAAE,EAAE;gBAChC,MAAM,CAAC,KAAK,CAAC,CAAC;YAChB,CAAC;SACF,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACP,CAAC"}

package/lib/connection-title.d.ts

@@ -0,0 +1,2 @@
+import { ConnectionInfo } from './connection-info';
+export declare function getConnectionTitle(info: ConnectionInfo): string;

package/lib/connection-title.js

@@ -0,0 +1,25 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getConnectionTitle = void 0;
+const mongodb_connection_string_url_1 = __importDefault(require("mongodb-connection-string-url"));
+function getConnectionTitle(info) {
+    var _a;
+    if ((_a = info.favorite) === null || _a === void 0 ? void 0 : _a.name) {
+        return info.favorite.name;
+    }
+    try {
+        const url = new mongodb_connection_string_url_1.default(info.connectionOptions.connectionString);
+        if (url.isSRV) {
+            return url.hosts[0];
+        }
+        return url.hosts.join(',');
+    }
+    catch (e) {
+        return info.connectionOptions.connectionString || 'Connection';
+    }
+}
+exports.getConnectionTitle = getConnectionTitle;
+//# sourceMappingURL=connection-title.js.map

package/lib/connection-title.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"connection-title.js","sourceRoot":"","sources":["../src/connection-title.ts"],"names":[],"mappings":";;;;;;AAAA,kGAA6D;AAG7D,SAAgB,kBAAkB,CAAC,IAAoB;;IACrD,IAAI,MAAA,IAAI,CAAC,QAAQ,0CAAE,IAAI,EAAE;QACvB,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC;KAC3B;IAED,IAAI;QACF,MAAM,GAAG,GAAG,IAAI,uCAAgB,CAAC,IAAI,CAAC,iBAAiB,CAAC,gBAAgB,CAAC,CAAC;QAC1E,IAAI,GAAG,CAAC,KAAK,EAAE;YACb,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;SACrB;QAED,OAAO,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;KAC5B;IAAC,OAAO,CAAC,EAAE;QAEV,OAAO,IAAI,CAAC,iBAAiB,CAAC,gBAAgB,IAAI,YAAY,CAAC;KAChE;AACH,CAAC;AAhBD,gDAgBC"}

package/lib/data-service.d.ts

@@ -1,22 +1,48 @@
 /// <reference types="node" />
 import { EventEmitter } from 'events';
-import { AggregateOptions, AggregationCursor, BulkWriteOptions, ClientSession, Collection, CollectionInfo, CountDocumentsOptions, CreateCollectionOptions, CreateIndexesOptions, DeleteOptions, DeleteResult, Document, EstimatedDocumentCountOptions, ExplainOptions, Filter, FindCursor, FindOneAndReplaceOptions, FindOneAndUpdateOptions, FindOptions, IndexSpecification, InsertManyResult, InsertOneOptions, InsertOneResult, TopologyDescription, UpdateFilter, UpdateOptions, UpdateResult } from 'mongodb';
-import { NativeClient as NativeClientType, NativeClientConnectionOptions } from './native-client';
-import { Callback, Instance } from './types';
-import { LegacyConnectionModel } from './legacy-connection-model';
+import { AggregateOptions, AggregationCursor, BulkWriteOptions, ClientSession, Collection, CountDocumentsOptions, CreateCollectionOptions, CreateIndexesOptions, DeleteOptions, DeleteResult, Document, EstimatedDocumentCountOptions, ExplainOptions, Filter, FindCursor, FindOneAndReplaceOptions, FindOneAndUpdateOptions, FindOptions, IndexSpecification, InsertManyResult, InsertOneOptions, InsertOneResult, MongoClientOptions, ReadPreferenceLike, TopologyDescription, UpdateFilter, UpdateOptions, UpdateResult } from 'mongodb';
+import ConnectionStringUrl from 'mongodb-connection-string-url';
+import { ConnectionOptions } from './connection-options';
+import { adaptCollectionInfo, adaptDatabaseInfo, InstanceDetails } from './instance-detail-helper';
+import { Callback, CollectionStats } from './types';
+import { ConnectionStatusWithPrivileges } from './run-command';
 declare class DataService extends EventEmitter {
-    lastSeenTopology: TopologyDescription | null;
-    client: NativeClientType;
-    constructor(model: LegacyConnectionModel);
-    getConnectionOptions(): NativeClientConnectionOptions | undefined;
+    private readonly _connectionOptions;
+    private _isConnecting;
+    private _mongoClientConnectionOptions?;
+    private _client?;
+    private _tunnel?;
+    private _lastSeenTopology;
+    private _isWritable;
+    private _isMongos;
+    private _id;
+    constructor(connectionOptions: ConnectionOptions);
+    getMongoClientConnectionOptions(): {
+        url: string;
+        options: MongoClientOptions;
+    } | undefined;
+    private _logCtx;
+    getConnectionOptions(): Readonly<ConnectionOptions>;
+    getConnectionString(): ConnectionStringUrl;
+    getReadPreference(): ReadPreferenceLike;
     collection(ns: string, options: unknown, callback: Callback<Document>): void;
-    collectionStats(databaseName: string, collectionName: string, callback: Callback<Document>): void;
+    collections(databaseName: string, callback: Callback<CollectionStats[]>): void;
+    collectionStats(databaseName: string, collectionName: string, callback: Callback<CollectionStats>): void;
+    collectionInfo(dbName: string, collName: string): Promise<ReturnType<typeof adaptCollectionInfo> | null>;
     command(databaseName: string, comm: Document, callback: Callback<Document>): void;
     isWritable(): boolean;
     isMongos(): boolean;
-    listCollections(databaseName: string, filter: Document, callback: Callback<CollectionInfo[]>): void;
-    listDatabases(callback: Callback<Document>): void;
-    connect(done: Callback<DataService>): void;
+    connectionStatus(): Promise<ConnectionStatusWithPrivileges>;
+    private _getPrivilegesOrFallback;
+    listCollections(databaseName: string, filter?: Document, { nameOnly, privileges, }?: {
+        nameOnly?: true;
+        privileges?: ConnectionStatusWithPrivileges['authInfo']['authenticatedUserPrivileges'] | null;
+    }): Promise<ReturnType<typeof adaptCollectionInfo>[]>;
+    listDatabases({ nameOnly, privileges, }?: {
+        nameOnly?: true;
+        privileges?: ConnectionStatusWithPrivileges['authInfo']['authenticatedUserPrivileges'] | null;
+    }): Promise<ReturnType<typeof adaptDatabaseInfo>[]>;
+    connect(): Promise<void>;
     estimatedCount(ns: string, options: EstimatedDocumentCountOptions, callback: Callback<number>): void;
     count(ns: string, filter: Filter<Document>, options: CountDocumentsOptions, callback: Callback<number>): void;
     createCollection(ns: string, options: CreateCollectionOptions, callback: Callback<Collection<Document>>): void;
@@ -24,7 +50,7 @@ declare class DataService extends EventEmitter {
     database(name: string, options: unknown, callback: Callback<Document>): void;
     deleteOne(ns: string, filter: Filter<Document>, options: DeleteOptions, callback: Callback<DeleteResult>): void;
     deleteMany(ns: string, filter: Filter<Document>, options: DeleteOptions, callback: Callback<DeleteResult>): void;
-    disconnect(callback: Callback<never>): void;
+    disconnect(): Promise<void>;
     dropCollection(ns: string, callback: Callback<boolean>): void;
     dropDatabase(name: string, callback: Callback<boolean>): void;
     dropIndex(ns: string, name: string, callback: Callback<Document>): void;
@@ -37,11 +63,13 @@ declare class DataService extends EventEmitter {
     findOneAndUpdate(ns: string, filter: Filter<Document>, update: Document, options: FindOneAndUpdateOptions, callback: Callback<Document>): void;
     explain(ns: string, filter: Filter<Document>, options: ExplainOptions, callback: Callback<Document>): void;
     indexes(ns: string, options: unknown, callback: Callback<Document>): void;
-    instance(options: unknown, callback: Callback<Instance>): void;
+    instance(): Promise<InstanceDetails>;
     insertOne(ns: string, doc: Document, options: InsertOneOptions, callback: Callback<InsertOneResult<Document>>): void;
     insertMany(ns: string, docs: Document[], options: BulkWriteOptions, callback: Callback<InsertManyResult<Document>>): void;
     putMany(ns: string, docs: Document[], options: BulkWriteOptions): Promise<InsertManyResult<Document>>;
-    updateCollection(ns: string, flags: Document, callback: Callback<Document>): void;
+    updateCollection(ns: string, flags: Document & {
+        collMod?: never;
+    }, callback: Callback<Document>): void;
     updateOne(ns: string, filter: Filter<Document>, update: Document | UpdateFilter<Document>, options: UpdateOptions, callback: Callback<Document>): void;
     updateMany(ns: string, filter: Filter<Document>, update: UpdateFilter<Document>, options: UpdateOptions, callback: Callback<Document | UpdateResult>): void;
     currentOp(includeAll: boolean, callback: Callback<Document>): void;
@@ -51,13 +79,29 @@ declare class DataService extends EventEmitter {
     createView(name: string, sourceNs: string, pipeline: Document[], options: CreateCollectionOptions, callback: Callback<Collection<Document>>): void;
     updateView(name: string, sourceNs: string, pipeline: Document[], options: Document, callback: Callback<Document>): void;
     dropView(ns: string, callback: Callback<boolean>): void;
-    sample(ns: string, args?: {
+    sample(ns: string, { query, size, fields, }?: {
         query?: Filter<Document>;
         size?: number;
         fields?: Document;
     }, options?: AggregateOptions): AggregationCursor;
     startSession(): ClientSession;
-    killSession(session: ClientSession): Promise<Document>;
+    killSessions(sessions: ClientSession | ClientSession[]): Promise<Document>;
     isConnected(): boolean;
+    private setupListeners;
+    private get _initializedClient();
+    private get _defaultDb();
+    databaseStats(name: string): Promise<Omit<ReturnType<typeof adaptDatabaseInfo>, '_id'>>;
+    private _buildCollectionDetail;
+    private _buildCollectionStats;
+    private _buildDatabaseDetail;
+    _collection(ns: string): Collection;
+    private _collectionNames;
+    private _collectionName;
+    private _databaseName;
+    private _checkIsWritable;
+    private _checkIsMongos;
+    private _translateMessage;
+    private _cleanup;
+    private _startLogOp;
 }
-export = DataService;
+export default DataService;