mongodb-data-service 21.13.0 → 21.16.0

package/lib/ssh-tunnel.js

@@ -7,30 +7,29 @@ exports.waitForTunnelError = exports.forceCloseTunnel = exports.openSshTunnel =
 const events_1 = require("events");
 const debug_1 = __importDefault(require("debug"));
 const fs_1 = __importDefault(require("fs"));
-const mongodb_connection_string_url_1 = __importDefault(require("mongodb-connection-string-url"));
+const crypto_1 = __importDefault(require("crypto"));
+const util_1 = require("util");
 const ssh_tunnel_1 = __importDefault(require("@mongodb-js/ssh-tunnel"));
 const compass_logging_1 = __importDefault(require("@mongodb-js/compass-logging"));
 const redact_1 = require("./redact");
-const debug = debug_1.default('mongodb-data-service:connect');
-const { log, mongoLogId } = compass_logging_1.default('COMPASS-CONNECT');
-async function openSshTunnel(srvResolvedConnectionString, sshTunnelOptions, localPort) {
+const debug = (0, debug_1.default)('mongodb-data-service:connect');
+const { log, mongoLogId } = (0, compass_logging_1.default)('COMPASS-CONNECT');
+const randomBytes = (0, util_1.promisify)(crypto_1.default.randomBytes);
+async function openSshTunnel(sshTunnelOptions) {
     if (!sshTunnelOptions) {
-        return [undefined, srvResolvedConnectionString];
+        return [undefined, undefined];
     }
-    const connectionStringUrl = new mongodb_connection_string_url_1.default(srvResolvedConnectionString);
-    if (connectionStringUrl.hosts.length !== 1) {
-        throw new Error('It is currently not possible to open an SSH tunnel to a replica set');
-    }
-    const [dstHost, dstPort = 27017] = connectionStringUrl.hosts[0].split(':');
+    const credentialsSource = await randomBytes(64);
+    const socks5Username = credentialsSource.slice(0, 32).toString('base64');
+    const socks5Password = credentialsSource.slice(32).toString('base64');
     const tunnelConstructorOptions = {
         readyTimeout: 20000,
         forwardTimeout: 20000,
         keepaliveInterval: 20000,
-        srcAddr: '127.0.0.1',
-        dstPort: dstPort,
-        dstAddr: dstHost,
-        localPort: localPort,
+        localPort: 0,
         localAddr: '127.0.0.1',
+        socks5Username: socks5Username,
+        socks5Password: socks5Password,
         host: sshTunnelOptions.host,
         port: sshTunnelOptions.port,
         username: sshTunnelOptions.username,
@@ -40,7 +39,7 @@ async function openSshTunnel(srvResolvedConnectionString, sshTunnelOptions, loca
             : undefined,
         passphrase: sshTunnelOptions.identityKeyPassphrase,
     };
-    const redactedTunnelOptions = redact_1.redactSshTunnelOptions(tunnelConstructorOptions);
+    const redactedTunnelOptions = (0, redact_1.redactSshTunnelOptions)(tunnelConstructorOptions);
     log.info(mongoLogId(1001000006), 'SSHTunnel', 'Creating SSH tunnel', redactedTunnelOptions);
     debug('creating ssh tunnel with options', redactedTunnelOptions);
     const tunnel = new ssh_tunnel_1.default(tunnelConstructorOptions);
@@ -48,8 +47,15 @@ async function openSshTunnel(srvResolvedConnectionString, sshTunnelOptions, loca
     await tunnel.listen();
     debug('ssh tunnel opened');
     log.info(mongoLogId(1001000007), 'SSHTunnel', 'SSH tunnel opened');
-    connectionStringUrl.hosts = [`127.0.0.1:${localPort}`];
-    return [tunnel, connectionStringUrl.href];
+    return [
+        tunnel,
+        {
+            proxyHost: 'localhost',
+            proxyPort: tunnel.config.localPort,
+            proxyUsername: socks5Username,
+            proxyPassword: socks5Password,
+        },
+    ];
 }
 exports.openSshTunnel = openSshTunnel;
 async function forceCloseTunnel(tunnelToClose) {
@@ -66,7 +72,7 @@ async function forceCloseTunnel(tunnelToClose) {
 }
 exports.forceCloseTunnel = forceCloseTunnel;
 async function waitForTunnelError(tunnel) {
-    const [error] = await events_1.once(tunnel || new events_1.EventEmitter(), 'error');
+    const [error] = await (0, events_1.once)(tunnel || new events_1.EventEmitter(), 'error');
     throw error;
 }
 exports.waitForTunnelError = waitForTunnelError;

package/lib/ssh-tunnel.js.map

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

package/lib/types.d.ts

@@ -14,9 +14,11 @@ export interface CollectionStats {
     index_sizes?: CollStats['indexSizes'];
     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'];
@@ -54,3 +56,4 @@ export interface CollectionDetails extends CollectionStats {
     database: string;
     indexes: IndexDetails[];
 }
+//# sourceMappingURL=types.d.ts.map

package/lib/types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAEnD,MAAM,WAAW,QAAQ,CAAC,CAAC;IACzB,CACE,GAAG,EAAE,KAAK,GAAG,QAAQ,GAAG;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,GAAG,SAAS,EAC9D,MAAM,EAAE,CAAC,GACR,IAAI,CAAC;CACT;AAED,MAAM,WAAW,eAAe;IAC9B,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,eAAe,EAAE,OAAO,CAAC;IACzB,WAAW,CAAC,EAAE,SAAS,CAAC,YAAY,CAAC,CAAC;IACtC,cAAc,EAAE,SAAS,CAAC,OAAO,CAAC,CAAC;IACnC,aAAa,CAAC,EAAE,SAAS,CAAC,MAAM,CAAC,CAAC;IAClC,iBAAiB,EAAE,MAAM,CAAC;IAC1B,YAAY,EAAE,MAAM,CAAC;IACrB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,CAAC,EAAE,SAAS,CAAC,eAAe,CAAC,CAAC;IAC5C,YAAY,CAAC,EAAE,SAAS,CAAC,YAAY,CAAC,CAAC;IACvC,gBAAgB,CAAC,EAAE,SAAS,CAAC,gBAAgB,CAAC,CAAC;IAC/C,UAAU,EAAE,SAAS,CAAC,WAAW,CAAC,CAAC;IACnC,iBAAiB,CAAC,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC;IACzC,IAAI,CAAC,EAAE,SAAS,CAAC,MAAM,CAAC,CAAC;IACzB,aAAa,EAAE,SAAS,CAAC,cAAc,CAAC,CAAC;IACzC,WAAW,EAAE,OAAO,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,CAAC;CAC/C;AAED,MAAM,WAAW,qBAAqB;IACpC,QAAQ,EAAE;QACR,aAAa,EAAE,MAAM,CAAC;QACtB,OAAO,EAAE,MAAM,CAAC;KACjB,CAAC;IACF,cAAc,EAAE,MAAM,CAAC;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC7B,eAAe,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACzC,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC/B,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC/B,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACpC,oBAAoB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC9C,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACrC,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACxC,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACtC;AAED,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,iBAAkB,SAAQ,eAAe;IACxD,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,YAAY,EAAE,CAAC;CACzB"}

package/package.json

@@ -7,7 +7,7 @@
     "email": "compass@mongodb.com"
   },
   "homepage": "https://github.com/mongodb-js/compass",
-  "version": "21.13.0",
+  "version": "21.16.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/mongodb-js/compass.git"
@@ -46,36 +46,35 @@
     "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",
+    "test-cov": "nyc -x \"**/*.spec.*\" --reporter=lcov --reporter=text --reporter=html npm run test",
     "test-watch": "npm run test -- --watch",
     "test-ci": "npm run test-cov",
     "posttest-ci": "node ../../scripts/killall-mongo.js",
     "reformat": "npm run prettier -- --write ."
   },
   "peerDependencies": {
-    "mongodb": "^4.1.0",
-    "mongodb-connection-model": "*"
+    "mongodb": "^4.3.0"
   },
   "dependencies": {
-    "@mongodb-js/compass-logging": "^0.4.0",
-    "@mongodb-js/ssh-tunnel": "^1.2.1",
+    "@mongodb-js/compass-logging": "^0.7.0",
+    "@mongodb-js/devtools-connect": "^1.1.3",
+    "@mongodb-js/ssh-tunnel": "^1.3.0",
     "async": "^3.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": "^2.1.0",
-    "mongodb-index-model": "^3.6.0",
-    "mongodb-ns": "^2.2.0",
-    "resolve-mongodb-srv": "^1.1.0",
+    "mongodb-build-info": "^1.3.0",
+    "mongodb-connection-model": "^21.12.0",
+    "mongodb-connection-string-url": "^2.4.2",
+    "mongodb-index-model": "^3.8.0",
+    "mongodb-ns": "^2.3.0",
     "uuid": "^8.3.2"
   },
   "devDependencies": {
-    "@mongodb-js/devtools-docker-test-envs": "^1.2.1",
-    "@mongodb-js/eslint-config-compass": "^0.4.0",
-    "@mongodb-js/mocha-config-compass": "^0.5.0",
-    "@mongodb-js/prettier-config-compass": "^0.3.0",
-    "@mongodb-js/tsconfig-compass": "^0.3.0",
+    "@mongodb-js/devtools-docker-test-envs": "^1.2.4",
+    "@mongodb-js/eslint-config-compass": "^0.6.0",
+    "@mongodb-js/mocha-config-compass": "^0.8.0",
+    "@mongodb-js/prettier-config-compass": "^0.4.0",
+    "@mongodb-js/tsconfig-compass": "^0.5.0",
     "@types/async": "^3.2.7",
     "@types/debug": "^4.1.7",
     "@types/lodash": "^4.14.172",
@@ -87,15 +86,14 @@
     "eslint": "^7.25.0",
     "kerberos": "^2.0.0-beta.0",
     "mocha": "^8.4.0",
-    "mongodb": "^4.1.0",
-    "mongodb-connection-model": "^21.9.0",
+    "mongodb": "^4.3.0",
     "mongodb-runner": "^4.8.3",
     "nyc": "^15.0.0",
     "prettier": "2.3.2",
     "rimraf": "^3.0.2",
     "sinon": "^9.2.3",
-    "storage-mixin": "^4.8.0",
+    "storage-mixin": "^4.10.0",
     "typescript": "^4.3.5"
   },
-  "gitHead": "8ef2cccaaab6d84a5fcd633ea8dfc4c7a4db551f"
+  "gitHead": "6563679c816fa44691a53b7e27fa0cb5539e0854"
 }