mongodb-data-service 21.11.0 → 21.15.0

package/lib/types.d.ts

@@ -1,102 +1,9 @@
-import { AnyError, CollStats, Db, Document, MongoClient } from 'mongodb';
+import type { AnyError, CollStats } from 'mongodb';
 export interface Callback<R> {
     (err: Error | AnyError | {
         message: string;
     } | null | undefined, result: R): void;
 }
-export interface ResolvedInstanceTaskData {
-    client: MongoClient;
-    db: Db;
-    userInfo: Document;
-    host: HostInfoDetails;
-    build: BuildInfoDetails;
-    cmdLineOpts: Document;
-    genuineMongoDB: GenuineMongoDBDetails;
-    dataLake: DataLakeDetails;
-    listDatabases: string[];
-    allowedDatabases: string[];
-    databases: InstanceDatabaseDetails[];
-    listCollections: InstanceCollectionDetails[];
-    allowedCollections: InstanceCollectionDetails[];
-    collections: InstanceCollectionDetails[];
-    hierarchy: never;
-    stats: InstanceDatabaseStats;
-}
-export declare type InstanceDetails = Omit<ResolvedInstanceTaskData, 'db' | 'listDatabases' | 'allowedDatabases' | 'userInfo' | 'listCollections' | 'allowedCollections' | 'cmdLineOpts'>;
-export interface Instance extends InstanceDetails {
-    _id?: string;
-    hostname: string;
-    port: number;
-}
-export interface InstanceCollectionDetails {
-    _id: string;
-    name: string;
-    database: string;
-    readonly: boolean;
-    collation: string | null;
-    type: string;
-    view_on?: string;
-    pipeline?: Document[];
-}
-export interface InstanceDatabaseDetails {
-    _id: string;
-    name: string;
-    document_count: number;
-    storage_size: number;
-    index_count: number;
-    index_size: number;
-    collections?: InstanceCollectionDetails[];
-}
-export interface HostInfoDetails {
-    system_time?: any;
-    hostname?: string;
-    os?: string;
-    os_family?: string;
-    kernel_version?: string;
-    kernel_version_string?: string;
-    memory_bits?: number;
-    memory_page_size?: number;
-    arch?: string;
-    cpu_cores?: number;
-    cpu_cores_physical?: number;
-    cpu_scheduler?: string;
-    cpu_frequency?: number;
-    cpu_string?: string;
-    cpu_bits?: number;
-    machine_model?: string;
-    feature_numa?: boolean;
-    feature_always_full_sync?: number;
-    feature_nfs_async?: number;
-}
-export interface GenuineMongoDBDetails {
-    isGenuine: boolean;
-    dbType: string;
-}
-export interface BuildInfoDetails {
-    version: string;
-    commit: string;
-    commit_url: string;
-    flags_loader: any;
-    flags_compiler: any;
-    allocator: string;
-    javascript_engine: string;
-    debug: boolean;
-    for_bits: number;
-    max_bson_object_size: number;
-    enterprise_module: boolean;
-    query_engine: any;
-    raw: Document;
-}
-export interface InstanceDatabaseStats {
-    document_count: number;
-    storage_size: number;
-    index_count: number;
-    index_size: number;
-}
-export interface DataLakeDetails {
-    isDataLake: boolean;
-    version: string;
-}
 export interface CollectionStats {
     ns: string;
     name: string;
@@ -105,11 +12,13 @@ export interface CollectionStats {
     max?: number;
     is_power_of_two: boolean;
     index_sizes?: CollStats['indexSizes'];
-    document_count: CollStats['documentCount'];
+    document_count: CollStats['count'];
     document_size?: CollStats['size'];
-    storage_size?: CollStats['storageSize'];
-    index_count?: CollStats['nindexes'];
-    index_size?: CollStats['totalIndexSize'];
+    avg_document_size: number;
+    storage_size: number;
+    free_storage_size: number;
+    index_count: number;
+    index_size: number;
     padding_factor?: CollStats['paddingFactor'];
     extent_count?: CollStats['numExtents'];
     extent_last_size?: CollStats['lastExtentSize'];

package/package.json

@@ -7,13 +7,13 @@
     "email": "compass@mongodb.com"
   },
   "homepage": "https://github.com/mongodb-js/compass",
-  "version": "21.11.0",
+  "version": "21.15.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/mongodb-js/compass.git"
   },
   "engines": {
-    "node": ">=12"
+    "node": ">=14.17.5"
   },
   "license": "SSPL",
   "keywords": [
@@ -21,6 +21,7 @@
   ],
   "main": "lib/index.js",
   "exports": {
+    "webpack": "./src/index.ts",
     "require": "./lib/index.js",
     "import": "./lib/.esm-wrapper.mjs"
   },
@@ -35,14 +36,14 @@
     "prepublishOnly": "npm run compile",
     "clean": "rimraf lib",
     "precompile": "npm run clean",
-    "compile": "tsc -p tsconfig.json && gen-esm-wrapper . ./lib/.esm-wrapper.mjs",
+    "compile": "tsc -p tsconfig.json",
     "depcheck": "depcheck",
     "eslint": "eslint",
     "prettier": "prettier",
     "lint": "npm run eslint . && npm run prettier -- --check .",
     "check": "npm run lint && npm run depcheck",
     "check-ci": "npm run check",
-    "pretest": "npm run compile && mongodb-runner start --port=27018 && node ../../scripts/rebuild.js keytar",
+    "pretest": "mongodb-runner start --port=27018 && node ../../scripts/rebuild.js keytar",
     "test": "mocha",
     "posttest": "mongodb-runner stop --port=27018",
     "test-cov": "nyc -x \"**/*.spec.*\" npm run test",
@@ -52,30 +53,29 @@
     "reformat": "npm run prettier -- --write ."
   },
   "peerDependencies": {
-    "mongodb": "^4.1.0",
+    "mongodb": "^4.2.2",
     "mongodb-connection-model": "*"
   },
   "dependencies": {
-    "@mongodb-js/compass-logging": "^0.2.0",
-    "@mongodb-js/ssh-tunnel": "^1.2.0",
+    "@mongodb-js/compass-logging": "^0.6.0",
+    "@mongodb-js/ssh-tunnel": "^1.2.1",
     "async": "^3.2.0",
-    "debug": "^4.2.0",
+    "debug": "4.3.0",
+    "get-port": "^5.1.1",
     "lodash": "^4.17.20",
-    "mongodb-build-info": "^1.1.1",
-    "mongodb-connection-string-url": "^1.0.1",
-    "mongodb-index-model": "^3.5.0",
-    "mongodb-js-errors": "^0.5.0",
+    "mongodb-build-info": "^1.3.0",
+    "mongodb-connection-string-url": "^2.4.1",
+    "mongodb-index-model": "^3.7.0",
     "mongodb-ns": "^2.2.0",
-    "mongodb-security": "^1.3.0",
-    "resolve-mongodb-srv": "^1.1.0",
+    "resolve-mongodb-srv": "^1.1.1",
     "uuid": "^8.3.2"
   },
   "devDependencies": {
-    "@mongodb-js/devtools-docker-test-envs": "^1.0.1",
-    "@mongodb-js/eslint-config-compass": "^0.3.0",
-    "@mongodb-js/mocha-config-compass": "^0.3.0",
-    "@mongodb-js/prettier-config-compass": "^0.2.0",
-    "@mongodb-js/tsconfig-compass": "^0.2.0",
+    "@mongodb-js/devtools-docker-test-envs": "^1.2.2",
+    "@mongodb-js/eslint-config-compass": "^0.5.0",
+    "@mongodb-js/mocha-config-compass": "^0.7.0",
+    "@mongodb-js/prettier-config-compass": "^0.4.0",
+    "@mongodb-js/tsconfig-compass": "^0.4.0",
     "@types/async": "^3.2.7",
     "@types/debug": "^4.1.7",
     "@types/lodash": "^4.14.172",
@@ -85,18 +85,17 @@
     "chai": "^4.2.0",
     "depcheck": "^1.4.1",
     "eslint": "^7.25.0",
+    "kerberos": "^2.0.0-beta.0",
     "mocha": "^8.4.0",
-    "mock-require": "^3.0.3",
-    "mongodb": "^4.1.0",
-    "mongodb-connection-model": "^21.8.0",
+    "mongodb": "^4.2.1",
+    "mongodb-connection-model": "^21.11.0",
     "mongodb-runner": "^4.8.3",
     "nyc": "^15.0.0",
     "prettier": "2.3.2",
     "rimraf": "^3.0.2",
     "sinon": "^9.2.3",
-    "sinon-chai": "^3.5.0",
-    "storage-mixin": "^4.7.0",
+    "storage-mixin": "^4.9.0",
     "typescript": "^4.3.5"
   },
-  "gitHead": "455c6523f99a08c6796480d59727b53bdfa441f0"
+  "gitHead": "542e3fa07d48435b1a7acc21c96de20562b843b3"
 }

package/lib/.esm-wrapper.mjs

@@ -1,3 +0,0 @@
-import mod from "./index.js";
-
-export default mod;

package/lib/legacy-connect.d.ts

@@ -1,7 +0,0 @@
-import { MongoClientOptions, MongoClient } from 'mongodb';
-import SSHTunnel from '@mongodb-js/ssh-tunnel';
-import { LegacyConnectionModel } from './legacy-connection-model';
-export default function connectCallback(model: LegacyConnectionModel, setupListeners: (client: MongoClient) => void, done: (err: Error | null, client: MongoClient, tunnel: SSHTunnel | null, options: {
-    url: string;
-    options: MongoClientOptions;
-}) => void): void;

package/lib/legacy-connect.js

@@ -1,123 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const events_1 = require("events");
-const mongodb_1 = require("mongodb");
-const ssh_tunnel_1 = __importDefault(require("@mongodb-js/ssh-tunnel"));
-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 debug_1 = __importDefault(require("debug"));
-const debug = debug_1.default('mongodb-data-service:connect');
-const { log, mongoLogId } = compass_logging_1.default('COMPASS-CONNECT');
-function removeGssapiServiceName(url) {
-    const uri = new mongodb_connection_string_url_1.default(url);
-    uri.searchParams.delete('gssapiServiceName');
-    return uri.toString();
-}
-async function openSshTunnel(model) {
-    if (!model.sshTunnel ||
-        model.sshTunnel === 'NONE' ||
-        !model.sshTunnelOptions) {
-        return null;
-    }
-    log.info(mongoLogId(1001000006), 'SSHTunnel', 'Creating SSH tunnel', redact_1.redactSshTunnelOptions(model.sshTunnelOptions));
-    debug('creating ssh tunnel with options', model.sshTunnel, redact_1.redactSshTunnelOptions(model.sshTunnelOptions));
-    const tunnel = new ssh_tunnel_1.default(model.sshTunnelOptions);
-    debug('ssh tunnel listen ...');
-    await tunnel.listen();
-    debug('ssh tunnel opened');
-    log.info(mongoLogId(1001000007), 'SSHTunnel', 'SSH tunnel opened');
-    return tunnel;
-}
-async function forceCloseTunnel(tunnelToClose) {
-    if (tunnelToClose) {
-        log.info(mongoLogId(1001000008), 'SSHTunnel', 'Closing SSH tunnel');
-        try {
-            await tunnelToClose.close();
-            debug('ssh tunnel stopped');
-        }
-        catch (err) {
-            debug('ssh tunnel stopped with error: %s', err.message);
-        }
-    }
-}
-async function waitForTunnelError(tunnel) {
-    const [error] = await events_1.once(tunnel || new events_1.EventEmitter(), 'error');
-    throw error;
-}
-function addDirectConnectionWhenNeeded(options, model) {
-    var _a;
-    if (model.directConnection === undefined &&
-        ((_a = model.hosts) === null || _a === void 0 ? void 0 : _a.length) === 1 &&
-        !model.isSrvRecord &&
-        !model.loadBalanced &&
-        (model.replicaSet === undefined || model.replicaSet === '')) {
-        return {
-            ...options,
-            directConnection: true,
-        };
-    }
-    return options;
-}
-async function connect(model, setupListeners) {
-    debug('connecting ...');
-    const url = removeGssapiServiceName(model.driverUrlWithSsh);
-    const options = {
-        ...addDirectConnectionWhenNeeded(model.driverOptions, model),
-    };
-    delete options.auth;
-    const tunnel = await openSshTunnel(model);
-    debug('creating MongoClient', {
-        url: redact_1.redactConnectionString(url),
-        options,
-    });
-    log.info(mongoLogId(1001000009), 'Connect', 'Initiating connection', {
-        url: redact_1.redactConnectionString(url),
-        options,
-    });
-    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;
-    }
-    const mongoClient = new mongodb_1.MongoClient(resolvedUrl, options);
-    if (setupListeners) {
-        setupListeners(mongoClient);
-    }
-    try {
-        debug('waiting for MongoClient to connect ...');
-        const client = (await Promise.race([
-            mongoClient.connect(),
-            waitForTunnelError(tunnel),
-        ]));
-        log.info(mongoLogId(1001000012), 'Connect', 'Connection established', {
-            url: redact_1.redactConnectionString(url),
-        });
-        return [client, tunnel, { url, options }];
-    }
-    catch (err) {
-        log.error(mongoLogId(1001000013), 'Connect', 'Connection attempt failed', { error: err.message });
-        debug('connection error', err);
-        debug('force shutting down ssh tunnel ...');
-        await forceCloseTunnel(tunnel);
-        throw err;
-    }
-}
-function connectCallback(model, setupListeners, done) {
-    connect(model, setupListeners).then(([client, tunnel, options]) => process.nextTick(() => done(null, client, tunnel, options)), (err) => process.nextTick(() => {
-        return done(err);
-    }));
-}
-exports.default = connectCallback;
-//# sourceMappingURL=legacy-connect.js.map

package/lib/legacy-connect.js.map

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

package/lib/legacy-connection-model.js

@@ -1,158 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.convertConnectionOptionsToModel = exports.convertConnectionModelToOptions = void 0;
-const mongodb_connection_string_url_1 = __importDefault(require("mongodb-connection-string-url"));
-const util_1 = require("util");
-const ConnectionModel = require('mongodb-connection-model');
-function convertConnectionModelToOptions(model) {
-    const options = {
-        id: model._id,
-        connectionString: model.driverUrl,
-    };
-    convertSslPropertiesToConnectionOptions(model, options);
-    if (model.sslCert && model.sslCert !== model.sslKey) {
-        options.tlsCertificateFile = model.sslCert;
-    }
-    if (model.sshTunnel !== 'NONE' &&
-        model.sshTunnelHostname &&
-        model.sshTunnelUsername) {
-        options.sshTunnel = {
-            host: model.sshTunnelHostname,
-            port: model.sshTunnelPort,
-            username: model.sshTunnelUsername,
-        };
-        if (model.sshTunnelPassword !== undefined) {
-            options.sshTunnel.password = model.sshTunnelPassword;
-        }
-        if (model.sshTunnelIdentityFile !== undefined) {
-            options.sshTunnel.privateKeyFile = model.sshTunnelIdentityFile;
-        }
-        if (model.sshTunnelPassphrase !== undefined) {
-            options.sshTunnel.privateKeyPassphrase = model.sshTunnelPassphrase;
-        }
-    }
-    if (model.isFavorite) {
-        options.favorite = {
-            name: model.name,
-            color: model.color,
-        };
-    }
-    return options;
-}
-exports.convertConnectionModelToOptions = convertConnectionModelToOptions;
-function convertSslPropertiesToConnectionOptions(model, options) {
-    const url = new mongodb_connection_string_url_1.default(options.connectionString);
-    switch (model.sslMethod) {
-        case 'SERVER':
-            url.searchParams.set('tlsAllowInvalidCertificates', 'false');
-            convertSslCAToConnectionString(model.sslCA, url);
-            break;
-        case 'ALL':
-            url.searchParams.set('tlsAllowInvalidCertificates', 'false');
-            convertSslCAToConnectionString(model.sslCA, url);
-            if (model.sslCert && model.sslCert !== model.sslKey) {
-                options.tlsCertificateFile = model.sslCert;
-            }
-            if (model.sslKey) {
-                url.searchParams.set('tlsCertificateKeyFile', model.sslKey);
-            }
-            if (model.sslPass) {
-                url.searchParams.set('tlsCertificateKeyFilePassword', model.sslPass);
-            }
-            break;
-        case 'UNVALIDATED':
-            url.searchParams.set('tlsAllowInvalidCertificates', 'true');
-            url.searchParams.set('tlsAllowInvalidHostnames', 'true');
-            break;
-        case 'SYSTEMCA':
-            url.searchParams.set('tlsAllowInvalidCertificates', 'false');
-            url.searchParams.set('tlsAllowInvalidHostnames', 'false');
-            break;
-        case 'IFAVAILABLE':
-            url.searchParams.set('tlsAllowInvalidCertificates', 'false');
-            url.searchParams.set('tlsAllowInvalidHostnames', 'true');
-            break;
-    }
-    options.connectionString = url.toString();
-}
-function convertSslCAToConnectionString(sslCA, url) {
-    if (!sslCA) {
-        return;
-    }
-    if (typeof sslCA === 'string') {
-        url.searchParams.set('tlsCAFile', sslCA);
-    }
-    else if (Array.isArray(sslCA) && sslCA.length > 0) {
-        url.searchParams.set('tlsCAFile', sslCA[0]);
-    }
-}
-async function convertConnectionOptionsToModel(options) {
-    const connection = await util_1.promisify(ConnectionModel.from)(options.connectionString);
-    const additionalOptions = {
-        _id: options.id,
-    };
-    convertSslOptionsToLegacyProperties(options, additionalOptions);
-    if (options.sshTunnel) {
-        additionalOptions.sshTunnel = !options.sshTunnel.privateKeyFile
-            ? 'USER_PASSWORD'
-            : 'IDENTITY_FILE';
-        additionalOptions.sshTunnelHostname = options.sshTunnel.host;
-        additionalOptions.sshTunnelUsername = options.sshTunnel.username;
-        additionalOptions.sshTunnelPassword = options.sshTunnel.password;
-        additionalOptions.sshTunnelIdentityFile = options.sshTunnel.privateKeyFile;
-        additionalOptions.sshTunnelPassphrase =
-            options.sshTunnel.privateKeyPassphrase;
-    }
-    if (options.favorite) {
-        additionalOptions.isFavorite = true;
-        additionalOptions.name = options.favorite.name;
-        additionalOptions.color = options.favorite.color;
-    }
-    return new ConnectionModel({
-        ...connection.toJSON(),
-        ...additionalOptions,
-    });
-}
-exports.convertConnectionOptionsToModel = convertConnectionOptionsToModel;
-function convertSslOptionsToLegacyProperties(options, properties) {
-    var _a;
-    const url = new mongodb_connection_string_url_1.default(options.connectionString);
-    const tlsAllowInvalidCertificates = url.searchParams.get('tlsAllowInvalidCertificates');
-    const tlsAllowInvalidHostnames = url.searchParams.get('tlsAllowInvalidHostnames');
-    const tlsCAFile = url.searchParams.get('tlsCAFile');
-    const tlsCertificateKeyFile = url.searchParams.get('tlsCertificateKeyFile');
-    const tlsCertificateKeyFilePassword = url.searchParams.get('tlsCertificateKeyFilePassword');
-    if (tlsAllowInvalidCertificates === 'false' && tlsCAFile) {
-        properties.sslMethod = 'SERVER';
-        properties.sslCert = undefined;
-        properties.sslKey = undefined;
-        if (options.tlsCertificateFile || tlsCertificateKeyFile) {
-            properties.sslMethod = 'ALL';
-            properties.sslCert = (_a = options.tlsCertificateFile) !== null && _a !== void 0 ? _a : tlsCertificateKeyFile;
-            properties.sslKey = tlsCertificateKeyFile !== null && tlsCertificateKeyFile !== void 0 ? tlsCertificateKeyFile : undefined;
-            properties.sslPass = tlsCertificateKeyFilePassword !== null && tlsCertificateKeyFilePassword !== void 0 ? tlsCertificateKeyFilePassword : undefined;
-        }
-    }
-    else {
-        properties.sslCA = undefined;
-        properties.sslCert = undefined;
-        properties.sslKey = undefined;
-        properties.sslPass = undefined;
-        if (tlsAllowInvalidCertificates === 'true' &&
-            tlsAllowInvalidHostnames === 'true') {
-            properties.sslMethod = 'UNVALIDATED';
-        }
-        else if (tlsAllowInvalidCertificates === 'false' &&
-            tlsAllowInvalidHostnames === 'false') {
-            properties.sslMethod = 'SYSTEMCA';
-        }
-        else if (tlsAllowInvalidCertificates === 'false' &&
-            tlsAllowInvalidHostnames === 'true') {
-            properties.sslMethod = 'IFAVAILABLE';
-        }
-    }
-}
-//# sourceMappingURL=legacy-connection-model.js.map

package/lib/legacy-connection-model.js.map

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