mongodb-data-service 21.14.0 → 21.16.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/connect-mongo-client.d.ts +6 -4
- package/lib/connect-mongo-client.d.ts.map +1 -0
- package/lib/connect-mongo-client.js +28 -63
- package/lib/connect-mongo-client.js.map +1 -1
- package/lib/connect.d.ts +2 -1
- package/lib/connect.d.ts.map +1 -0
- package/lib/connection-info.d.ts +3 -3
- package/lib/connection-info.d.ts.map +1 -0
- package/lib/connection-options.d.ts +1 -0
- package/lib/connection-options.d.ts.map +1 -0
- package/lib/connection-secrets.d.ts +2 -1
- package/lib/connection-secrets.d.ts.map +1 -0
- package/lib/connection-secrets.js +15 -13
- package/lib/connection-secrets.js.map +1 -1
- package/lib/connection-storage.d.ts +4 -1
- package/lib/connection-storage.d.ts.map +1 -0
- package/lib/connection-storage.js +7 -6
- package/lib/connection-storage.js.map +1 -1
- package/lib/connection-title.d.ts +2 -1
- package/lib/connection-title.d.ts.map +1 -0
- package/lib/data-service.d.ts +16 -9
- package/lib/data-service.d.ts.map +1 -0
- package/lib/data-service.js +38 -34
- package/lib/data-service.js.map +1 -1
- package/lib/index.d.ts +4 -3
- package/lib/index.d.ts.map +1 -0
- package/lib/index.js +2 -1
- package/lib/index.js.map +1 -1
- package/lib/instance-detail-helper.d.ts +5 -5
- package/lib/instance-detail-helper.d.ts.map +1 -0
- package/lib/instance-detail-helper.js +16 -17
- package/lib/instance-detail-helper.js.map +1 -1
- package/lib/legacy/legacy-connection-model.d.ts +6 -4
- package/lib/legacy/legacy-connection-model.d.ts.map +1 -0
- package/lib/legacy/legacy-connection-model.js +29 -25
- package/lib/legacy/legacy-connection-model.js.map +1 -1
- package/lib/redact.d.ts +4 -3
- package/lib/redact.d.ts.map +1 -0
- package/lib/redact.js +1 -1
- package/lib/redact.js.map +1 -1
- package/lib/run-command.d.ts +2 -1
- package/lib/run-command.d.ts.map +1 -0
- package/lib/run-command.js.map +1 -1
- package/lib/ssh-tunnel.d.ts +6 -2
- package/lib/ssh-tunnel.d.ts.map +1 -0
- package/lib/ssh-tunnel.js +24 -18
- package/lib/ssh-tunnel.js.map +1 -1
- package/lib/types.d.ts +6 -3
- package/lib/types.d.ts.map +1 -0
- package/package.json +17 -19
|
@@ -12,7 +12,7 @@ function convertConnectionModelToInfo(model) {
|
|
|
12
12
|
var _a;
|
|
13
13
|
const legacyModel = model instanceof ConnectionModel ? model : new ConnectionModel(model);
|
|
14
14
|
if (legacyModel.connectionInfo) {
|
|
15
|
-
const connectionInfo = connection_secrets_1.mergeSecrets(legacyModel.connectionInfo, (_a = legacyModel.secrets) !== null && _a !== void 0 ? _a : {});
|
|
15
|
+
const connectionInfo = (0, connection_secrets_1.mergeSecrets)(legacyModel.connectionInfo, (_a = legacyModel.secrets) !== null && _a !== void 0 ? _a : {});
|
|
16
16
|
if (connectionInfo.lastUsed) {
|
|
17
17
|
connectionInfo.lastUsed = new Date(connectionInfo.lastUsed);
|
|
18
18
|
}
|
|
@@ -51,35 +51,36 @@ function convertConnectionModelToInfo(model) {
|
|
|
51
51
|
exports.convertConnectionModelToInfo = convertConnectionModelToInfo;
|
|
52
52
|
function setConnectionStringParam(connectionOptions, param, value) {
|
|
53
53
|
const url = new mongodb_connection_string_url_1.default(connectionOptions.connectionString);
|
|
54
|
-
url.
|
|
54
|
+
url.typedSearchParams().set(param, value);
|
|
55
55
|
connectionOptions.connectionString = url.toString();
|
|
56
56
|
}
|
|
57
57
|
function modelSslPropertiesToConnectionOptions(driverOptions, connectionOptions) {
|
|
58
58
|
const url = new mongodb_connection_string_url_1.default(connectionOptions.connectionString);
|
|
59
|
+
const searchParams = url.typedSearchParams();
|
|
59
60
|
if (driverOptions.sslValidate === false) {
|
|
60
|
-
|
|
61
|
+
searchParams.set('tlsAllowInvalidCertificates', 'true');
|
|
61
62
|
}
|
|
62
63
|
if (driverOptions.tlsAllowInvalidHostnames) {
|
|
63
|
-
|
|
64
|
+
searchParams.set('tlsAllowInvalidHostnames', 'true');
|
|
64
65
|
}
|
|
65
66
|
const sslCA = getSslDriverOptionsFile(driverOptions.sslCA);
|
|
66
67
|
const sslCert = getSslDriverOptionsFile(driverOptions.sslCert);
|
|
67
68
|
const sslKey = getSslDriverOptionsFile(driverOptions.sslKey);
|
|
68
69
|
if (sslCA) {
|
|
69
|
-
|
|
70
|
+
searchParams.set('tlsCAFile', sslCA);
|
|
70
71
|
}
|
|
71
72
|
if (sslCert && sslCert !== sslKey) {
|
|
72
|
-
|
|
73
|
+
searchParams.set('tlsCertificateFile', sslCert);
|
|
73
74
|
}
|
|
74
75
|
if (sslKey) {
|
|
75
|
-
|
|
76
|
+
searchParams.set('tlsCertificateKeyFile', sslKey);
|
|
76
77
|
}
|
|
77
78
|
if (driverOptions.sslPass) {
|
|
78
|
-
|
|
79
|
+
searchParams.set('tlsCertificateKeyFilePassword', driverOptions.sslPass);
|
|
79
80
|
}
|
|
80
|
-
if (
|
|
81
|
-
|
|
82
|
-
|
|
81
|
+
if (searchParams.get('ssl') === 'true' &&
|
|
82
|
+
searchParams.get('tls') === 'true') {
|
|
83
|
+
searchParams.delete('ssl');
|
|
83
84
|
}
|
|
84
85
|
connectionOptions.connectionString = url.toString();
|
|
85
86
|
}
|
|
@@ -144,16 +145,17 @@ async function convertConnectionInfoToModel(connectionInfo) {
|
|
|
144
145
|
return new ConnectionModel({
|
|
145
146
|
...connection.toJSON(),
|
|
146
147
|
...additionalOptions,
|
|
147
|
-
...connection_secrets_1.extractSecrets(connectionInfo),
|
|
148
|
+
...(0, connection_secrets_1.extractSecrets)(connectionInfo),
|
|
148
149
|
});
|
|
149
150
|
}
|
|
150
151
|
exports.convertConnectionInfoToModel = convertConnectionInfoToModel;
|
|
151
152
|
function convertSslOptionsToLegacyProperties(options, properties) {
|
|
152
153
|
const url = new mongodb_connection_string_url_1.default(options.connectionString);
|
|
153
|
-
const
|
|
154
|
-
const
|
|
155
|
-
const
|
|
156
|
-
const
|
|
154
|
+
const searchParams = url.typedSearchParams();
|
|
155
|
+
const tlsCAFile = searchParams.get('tlsCAFile');
|
|
156
|
+
const tlsCertificateKeyFile = searchParams.get('tlsCertificateKeyFile');
|
|
157
|
+
const tlsCertificateKeyFilePassword = searchParams.get('tlsCertificateKeyFilePassword');
|
|
158
|
+
const tlsCertificateFile = searchParams.get('tlsCertificateFile');
|
|
157
159
|
if (tlsCAFile) {
|
|
158
160
|
properties.sslCA = [tlsCAFile];
|
|
159
161
|
}
|
|
@@ -170,12 +172,13 @@ function convertSslOptionsToLegacyProperties(options, properties) {
|
|
|
170
172
|
}
|
|
171
173
|
function optionsToSslMethod(options) {
|
|
172
174
|
const url = new mongodb_connection_string_url_1.default(options.connectionString);
|
|
173
|
-
const
|
|
174
|
-
const
|
|
175
|
-
const
|
|
176
|
-
const
|
|
177
|
-
const
|
|
178
|
-
const
|
|
175
|
+
const searchParams = url.typedSearchParams();
|
|
176
|
+
const tls = searchParams.get('tls') || searchParams.get('ssl');
|
|
177
|
+
const tlsAllowInvalidCertificates = searchParams.get('tlsAllowInvalidCertificates');
|
|
178
|
+
const tlsAllowInvalidHostnames = searchParams.get('tlsAllowInvalidHostnames');
|
|
179
|
+
const tlsInsecure = searchParams.get('tlsInsecure');
|
|
180
|
+
const tlsCAFile = searchParams.get('tlsCAFile');
|
|
181
|
+
const tlsCertificateKeyFile = searchParams.get('tlsCertificateKeyFile');
|
|
179
182
|
if (tls === 'false') {
|
|
180
183
|
return 'NONE';
|
|
181
184
|
}
|
|
@@ -194,9 +197,10 @@ function optionsToSslMethod(options) {
|
|
|
194
197
|
}
|
|
195
198
|
function removeAWSParams(connectionString) {
|
|
196
199
|
const url = new mongodb_connection_string_url_1.default(connectionString);
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
+
const searchParams = url.typedSearchParams();
|
|
201
|
+
if (searchParams.get('authMechanism') === 'MONGODB-AWS') {
|
|
202
|
+
searchParams.delete('authMechanism');
|
|
203
|
+
searchParams.delete('authMechanismProperties');
|
|
200
204
|
}
|
|
201
205
|
return url.href;
|
|
202
206
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"legacy-connection-model.js","sourceRoot":"","sources":["../../src/legacy/legacy-connection-model.ts"],"names":[],"mappings":";;;;;;
|
|
1
|
+
{"version":3,"file":"legacy-connection-model.js","sourceRoot":"","sources":["../../src/legacy/legacy-connection-model.ts"],"names":[],"mappings":"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"}
|
package/lib/redact.d.ts
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
|
-
import { SshTunnelConfig } from '@mongodb-js/ssh-tunnel';
|
|
2
|
-
import { ConnectionOptions } from './connection-options';
|
|
1
|
+
import type { SshTunnelConfig } from '@mongodb-js/ssh-tunnel';
|
|
2
|
+
import type { ConnectionOptions } from './connection-options';
|
|
3
3
|
import { redactConnectionString } from 'mongodb-connection-string-url';
|
|
4
4
|
export { redactConnectionString };
|
|
5
5
|
export declare function redactConnectionOptions(options: ConnectionOptions): ConnectionOptions;
|
|
6
|
-
export declare function redactSshTunnelOptions(options:
|
|
6
|
+
export declare function redactSshTunnelOptions<T extends Partial<SshTunnelConfig>>(options: T): T;
|
|
7
|
+
//# sourceMappingURL=redact.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"redact.d.ts","sourceRoot":"","sources":["../src/redact.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAC9D,OAAO,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AACvE,OAAO,EAAE,sBAAsB,EAAE,CAAC;AAElC,wBAAgB,uBAAuB,CACrC,OAAO,EAAE,iBAAiB,GACzB,iBAAiB,CAuBnB;AAED,wBAAgB,sBAAsB,CAAC,CAAC,SAAS,OAAO,CAAC,eAAe,CAAC,EACvE,OAAO,EAAE,CAAC,GACT,CAAC,CAgBH"}
|
package/lib/redact.js
CHANGED
|
@@ -14,7 +14,7 @@ function redactConnectionOptions(options) {
|
|
|
14
14
|
...options,
|
|
15
15
|
sshTunnel: redactedTunnelOptions,
|
|
16
16
|
};
|
|
17
|
-
redacted.connectionString = mongodb_connection_string_url_1.redactConnectionString(options.connectionString);
|
|
17
|
+
redacted.connectionString = (0, mongodb_connection_string_url_1.redactConnectionString)(options.connectionString);
|
|
18
18
|
if ((_a = redacted.sshTunnel) === null || _a === void 0 ? void 0 : _a.password) {
|
|
19
19
|
redacted.sshTunnel.password = '<redacted>';
|
|
20
20
|
}
|
package/lib/redact.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"redact.js","sourceRoot":"","sources":["../src/redact.ts"],"names":[],"mappings":";;;AAEA,iFAAuE;AAC9D,uGADA,sDAAsB,OACA;AAE/B,SAAgB,uBAAuB,CACrC,OAA0B;;IAE1B,MAAM,qBAAqB,GAAG,OAAO,CAAC,SAAS;QAC7C,CAAC,CAAC;YACE,GAAG,OAAO,CAAC,SAAS;SACrB;QACH,CAAC,CAAC,SAAS,CAAC;IAEd,MAAM,QAAQ,GAAsB;QAClC,GAAG,OAAO;QACV,SAAS,EAAE,qBAAqB;KACjC,CAAC;IAEF,QAAQ,CAAC,gBAAgB,GAAG,sDAAsB,
|
|
1
|
+
{"version":3,"file":"redact.js","sourceRoot":"","sources":["../src/redact.ts"],"names":[],"mappings":";;;AAEA,iFAAuE;AAC9D,uGADA,sDAAsB,OACA;AAE/B,SAAgB,uBAAuB,CACrC,OAA0B;;IAE1B,MAAM,qBAAqB,GAAG,OAAO,CAAC,SAAS;QAC7C,CAAC,CAAC;YACE,GAAG,OAAO,CAAC,SAAS;SACrB;QACH,CAAC,CAAC,SAAS,CAAC;IAEd,MAAM,QAAQ,GAAsB;QAClC,GAAG,OAAO;QACV,SAAS,EAAE,qBAAqB;KACjC,CAAC;IAEF,QAAQ,CAAC,gBAAgB,GAAG,IAAA,sDAAsB,EAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAE7E,IAAI,MAAA,QAAQ,CAAC,SAAS,0CAAE,QAAQ,EAAE;QAChC,QAAQ,CAAC,SAAS,CAAC,QAAQ,GAAG,YAAY,CAAC;KAC5C;IAED,IAAI,MAAA,QAAQ,CAAC,SAAS,0CAAE,qBAAqB,EAAE;QAC7C,QAAQ,CAAC,SAAS,CAAC,qBAAqB,GAAG,YAAY,CAAC;KACzD;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC;AAzBD,0DAyBC;AAED,SAAgB,sBAAsB,CACpC,OAAU;IAEV,MAAM,QAAQ,GAAG,EAAE,GAAG,OAAO,EAAE,CAAC;IAEhC,IAAI,QAAQ,CAAC,QAAQ,EAAE;QACrB,QAAQ,CAAC,QAAQ,GAAG,YAAY,CAAC;KAClC;IAED,IAAI,QAAQ,CAAC,UAAU,EAAE;QACvB,QAAQ,CAAC,UAAU,GAAG,YAAY,CAAC;KACpC;IAED,IAAI,QAAQ,CAAC,UAAU,EAAE;QACvB,QAAQ,CAAC,UAAU,GAAG,YAAY,CAAC;KACpC;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC;AAlBD,wDAkBC"}
|
package/lib/run-command.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Document, Db, RunCommandOptions } from 'mongodb';
|
|
1
|
+
import type { Document, Db, RunCommandOptions } from 'mongodb';
|
|
2
2
|
import type { Binary } from 'bson';
|
|
3
3
|
export declare type ConnectionStatus = {
|
|
4
4
|
authInfo: {
|
|
@@ -207,3 +207,4 @@ interface RunCommand extends RunDiagnosticsCommand, RunAdministrationCommand {
|
|
|
207
207
|
}
|
|
208
208
|
export declare const runCommand: RunCommand;
|
|
209
209
|
export {};
|
|
210
|
+
//# sourceMappingURL=run-command.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"run-command.d.ts","sourceRoot":"","sources":["../src/run-command.ts"],"names":[],"mappings":"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"}
|
package/lib/run-command.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-command.js","sourceRoot":"","sources":["../src/run-command.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"run-command.js","sourceRoot":"","sources":["../src/run-command.ts"],"names":[],"mappings":";;;AACA,qCAAyC;AAsQlC,MAAM,UAAU,GAAe,CACpC,EAAM,EACN,IAAc,EACd,OAA2B,EAC3B,EAAE;;IAUF,MAAM,cAAc,GAAG,MAAA,EAAE,CAAC,cAAc,mCAAI,wBAAc,CAAC,iBAAiB,CAAC;IAE7E,OAAO,EAAE,CAAC,OAAO,CACf,EAAE,GAAG,IAAI,EAAE,EACX,EAAE,cAAc,EAAE,GAAG,OAAO,EAAuB,CAI7C,CAAC;AACX,CAAC,CAAC;AAvBW,QAAA,UAAU,cAuBrB"}
|
package/lib/ssh-tunnel.d.ts
CHANGED
|
@@ -1,5 +1,9 @@
|
|
|
1
1
|
import SSHTunnel from '@mongodb-js/ssh-tunnel';
|
|
2
|
-
import {
|
|
3
|
-
|
|
2
|
+
import type { MongoClientOptions } from 'mongodb';
|
|
3
|
+
import type { ConnectionSshOptions } from './connection-options';
|
|
4
|
+
declare type Socks5Options = Pick<MongoClientOptions, 'proxyHost' | 'proxyPort' | 'proxyUsername' | 'proxyPassword'>;
|
|
5
|
+
export declare function openSshTunnel(sshTunnelOptions: ConnectionSshOptions | undefined): Promise<[SSHTunnel | undefined, Socks5Options | undefined]>;
|
|
4
6
|
export declare function forceCloseTunnel(tunnelToClose?: SSHTunnel | void): Promise<void>;
|
|
5
7
|
export declare function waitForTunnelError(tunnel: SSHTunnel | void): Promise<never>;
|
|
8
|
+
export {};
|
|
9
|
+
//# sourceMappingURL=ssh-tunnel.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ssh-tunnel.d.ts","sourceRoot":"","sources":["../src/ssh-tunnel.ts"],"names":[],"mappings":"AAMA,OAAO,SAAS,MAAM,wBAAwB,CAAC;AAE/C,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAC;AAElD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAOjE,aAAK,aAAa,GAAG,IAAI,CACvB,kBAAkB,EAClB,WAAW,GAAG,WAAW,GAAG,eAAe,GAAG,eAAe,CAC9D,CAAC;AAEF,wBAAsB,aAAa,CACjC,gBAAgB,EAAE,oBAAoB,GAAG,SAAS,GACjD,OAAO,CAAC,CAAC,SAAS,GAAG,SAAS,EAAE,aAAa,GAAG,SAAS,CAAC,CAAC,CAyD7D;AAED,wBAAsB,gBAAgB,CACpC,aAAa,CAAC,EAAE,SAAS,GAAG,IAAI,GAC/B,OAAO,CAAC,IAAI,CAAC,CAUf;AAED,wBAAsB,kBAAkB,CACtC,MAAM,EAAE,SAAS,GAAG,IAAI,GACvB,OAAO,CAAC,KAAK,CAAC,CAGhB"}
|
package/lib/ssh-tunnel.js
CHANGED
|
@@ -7,30 +7,29 @@ exports.waitForTunnelError = exports.forceCloseTunnel = exports.openSshTunnel =
|
|
|
7
7
|
const events_1 = require("events");
|
|
8
8
|
const debug_1 = __importDefault(require("debug"));
|
|
9
9
|
const fs_1 = __importDefault(require("fs"));
|
|
10
|
-
const
|
|
10
|
+
const crypto_1 = __importDefault(require("crypto"));
|
|
11
|
+
const util_1 = require("util");
|
|
11
12
|
const ssh_tunnel_1 = __importDefault(require("@mongodb-js/ssh-tunnel"));
|
|
12
13
|
const compass_logging_1 = __importDefault(require("@mongodb-js/compass-logging"));
|
|
13
14
|
const redact_1 = require("./redact");
|
|
14
|
-
const debug = debug_1.default('mongodb-data-service:connect');
|
|
15
|
-
const { log, mongoLogId } = compass_logging_1.default('COMPASS-CONNECT');
|
|
16
|
-
|
|
15
|
+
const debug = (0, debug_1.default)('mongodb-data-service:connect');
|
|
16
|
+
const { log, mongoLogId } = (0, compass_logging_1.default)('COMPASS-CONNECT');
|
|
17
|
+
const randomBytes = (0, util_1.promisify)(crypto_1.default.randomBytes);
|
|
18
|
+
async function openSshTunnel(sshTunnelOptions) {
|
|
17
19
|
if (!sshTunnelOptions) {
|
|
18
|
-
return [undefined,
|
|
20
|
+
return [undefined, undefined];
|
|
19
21
|
}
|
|
20
|
-
const
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
}
|
|
24
|
-
const [dstHost, dstPort = 27017] = connectionStringUrl.hosts[0].split(':');
|
|
22
|
+
const credentialsSource = await randomBytes(64);
|
|
23
|
+
const socks5Username = credentialsSource.slice(0, 32).toString('base64');
|
|
24
|
+
const socks5Password = credentialsSource.slice(32).toString('base64');
|
|
25
25
|
const tunnelConstructorOptions = {
|
|
26
26
|
readyTimeout: 20000,
|
|
27
27
|
forwardTimeout: 20000,
|
|
28
28
|
keepaliveInterval: 20000,
|
|
29
|
-
|
|
30
|
-
dstPort: dstPort,
|
|
31
|
-
dstAddr: dstHost,
|
|
32
|
-
localPort: localPort,
|
|
29
|
+
localPort: 0,
|
|
33
30
|
localAddr: '127.0.0.1',
|
|
31
|
+
socks5Username: socks5Username,
|
|
32
|
+
socks5Password: socks5Password,
|
|
34
33
|
host: sshTunnelOptions.host,
|
|
35
34
|
port: sshTunnelOptions.port,
|
|
36
35
|
username: sshTunnelOptions.username,
|
|
@@ -40,7 +39,7 @@ async function openSshTunnel(srvResolvedConnectionString, sshTunnelOptions, loca
|
|
|
40
39
|
: undefined,
|
|
41
40
|
passphrase: sshTunnelOptions.identityKeyPassphrase,
|
|
42
41
|
};
|
|
43
|
-
const redactedTunnelOptions = redact_1.redactSshTunnelOptions(tunnelConstructorOptions);
|
|
42
|
+
const redactedTunnelOptions = (0, redact_1.redactSshTunnelOptions)(tunnelConstructorOptions);
|
|
44
43
|
log.info(mongoLogId(1001000006), 'SSHTunnel', 'Creating SSH tunnel', redactedTunnelOptions);
|
|
45
44
|
debug('creating ssh tunnel with options', redactedTunnelOptions);
|
|
46
45
|
const tunnel = new ssh_tunnel_1.default(tunnelConstructorOptions);
|
|
@@ -48,8 +47,15 @@ async function openSshTunnel(srvResolvedConnectionString, sshTunnelOptions, loca
|
|
|
48
47
|
await tunnel.listen();
|
|
49
48
|
debug('ssh tunnel opened');
|
|
50
49
|
log.info(mongoLogId(1001000007), 'SSHTunnel', 'SSH tunnel opened');
|
|
51
|
-
|
|
52
|
-
|
|
50
|
+
return [
|
|
51
|
+
tunnel,
|
|
52
|
+
{
|
|
53
|
+
proxyHost: 'localhost',
|
|
54
|
+
proxyPort: tunnel.config.localPort,
|
|
55
|
+
proxyUsername: socks5Username,
|
|
56
|
+
proxyPassword: socks5Password,
|
|
57
|
+
},
|
|
58
|
+
];
|
|
53
59
|
}
|
|
54
60
|
exports.openSshTunnel = openSshTunnel;
|
|
55
61
|
async function forceCloseTunnel(tunnelToClose) {
|
|
@@ -66,7 +72,7 @@ async function forceCloseTunnel(tunnelToClose) {
|
|
|
66
72
|
}
|
|
67
73
|
exports.forceCloseTunnel = forceCloseTunnel;
|
|
68
74
|
async function waitForTunnelError(tunnel) {
|
|
69
|
-
const [error] = await events_1.once(tunnel || new events_1.EventEmitter(), 'error');
|
|
75
|
+
const [error] = await (0, events_1.once)(tunnel || new events_1.EventEmitter(), 'error');
|
|
70
76
|
throw error;
|
|
71
77
|
}
|
|
72
78
|
exports.waitForTunnelError = waitForTunnelError;
|
package/lib/ssh-tunnel.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ssh-tunnel.js","sourceRoot":"","sources":["../src/ssh-tunnel.ts"],"names":[],"mappings":";;;;;;AAAA,mCAA4C;AAC5C,kDAAgC;AAChC,4CAAoB;
|
|
1
|
+
{"version":3,"file":"ssh-tunnel.js","sourceRoot":"","sources":["../src/ssh-tunnel.ts"],"names":[],"mappings":"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"}
|
package/lib/types.d.ts
CHANGED
|
@@ -14,9 +14,11 @@ export interface CollectionStats {
|
|
|
14
14
|
index_sizes?: CollStats['indexSizes'];
|
|
15
15
|
document_count: CollStats['count'];
|
|
16
16
|
document_size?: CollStats['size'];
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
17
|
+
avg_document_size: number;
|
|
18
|
+
storage_size: number;
|
|
19
|
+
free_storage_size: number;
|
|
20
|
+
index_count: number;
|
|
21
|
+
index_size: number;
|
|
20
22
|
padding_factor?: CollStats['paddingFactor'];
|
|
21
23
|
extent_count?: CollStats['numExtents'];
|
|
22
24
|
extent_last_size?: CollStats['lastExtentSize'];
|
|
@@ -54,3 +56,4 @@ export interface CollectionDetails extends CollectionStats {
|
|
|
54
56
|
database: string;
|
|
55
57
|
indexes: IndexDetails[];
|
|
56
58
|
}
|
|
59
|
+
//# sourceMappingURL=types.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
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
CHANGED
|
@@ -7,7 +7,7 @@
|
|
|
7
7
|
"email": "compass@mongodb.com"
|
|
8
8
|
},
|
|
9
9
|
"homepage": "https://github.com/mongodb-js/compass",
|
|
10
|
-
"version": "21.
|
|
10
|
+
"version": "21.16.1",
|
|
11
11
|
"repository": {
|
|
12
12
|
"type": "git",
|
|
13
13
|
"url": "https://github.com/mongodb-js/compass.git"
|
|
@@ -46,36 +46,35 @@
|
|
|
46
46
|
"pretest": "mongodb-runner start --port=27018 && node ../../scripts/rebuild.js keytar",
|
|
47
47
|
"test": "mocha",
|
|
48
48
|
"posttest": "mongodb-runner stop --port=27018",
|
|
49
|
-
"test-cov": "nyc -x \"**/*.spec.*\" npm run test",
|
|
49
|
+
"test-cov": "nyc -x \"**/*.spec.*\" --reporter=lcov --reporter=text --reporter=html npm run test",
|
|
50
50
|
"test-watch": "npm run test -- --watch",
|
|
51
51
|
"test-ci": "npm run test-cov",
|
|
52
52
|
"posttest-ci": "node ../../scripts/killall-mongo.js",
|
|
53
53
|
"reformat": "npm run prettier -- --write ."
|
|
54
54
|
},
|
|
55
55
|
"peerDependencies": {
|
|
56
|
-
"mongodb": "^4.
|
|
57
|
-
"mongodb-connection-model": "*"
|
|
56
|
+
"mongodb": "^4.3.0"
|
|
58
57
|
},
|
|
59
58
|
"dependencies": {
|
|
60
|
-
"@mongodb-js/compass-logging": "^0.
|
|
61
|
-
"@mongodb-js/
|
|
59
|
+
"@mongodb-js/compass-logging": "^0.7.0",
|
|
60
|
+
"@mongodb-js/devtools-connect": "^1.1.3",
|
|
61
|
+
"@mongodb-js/ssh-tunnel": "^1.3.0",
|
|
62
62
|
"async": "^3.2.0",
|
|
63
63
|
"debug": "4.3.0",
|
|
64
|
-
"get-port": "^5.1.1",
|
|
65
64
|
"lodash": "^4.17.20",
|
|
66
65
|
"mongodb-build-info": "^1.3.0",
|
|
67
|
-
"mongodb-connection-
|
|
68
|
-
"mongodb-
|
|
69
|
-
"mongodb-
|
|
70
|
-
"
|
|
66
|
+
"mongodb-connection-model": "^21.12.1",
|
|
67
|
+
"mongodb-connection-string-url": "^2.4.2",
|
|
68
|
+
"mongodb-index-model": "^3.8.0",
|
|
69
|
+
"mongodb-ns": "^2.3.0",
|
|
71
70
|
"uuid": "^8.3.2"
|
|
72
71
|
},
|
|
73
72
|
"devDependencies": {
|
|
74
|
-
"@mongodb-js/devtools-docker-test-envs": "^1.2.
|
|
75
|
-
"@mongodb-js/eslint-config-compass": "^0.
|
|
76
|
-
"@mongodb-js/mocha-config-compass": "^0.
|
|
73
|
+
"@mongodb-js/devtools-docker-test-envs": "^1.2.4",
|
|
74
|
+
"@mongodb-js/eslint-config-compass": "^0.6.0",
|
|
75
|
+
"@mongodb-js/mocha-config-compass": "^0.8.0",
|
|
77
76
|
"@mongodb-js/prettier-config-compass": "^0.4.0",
|
|
78
|
-
"@mongodb-js/tsconfig-compass": "^0.
|
|
77
|
+
"@mongodb-js/tsconfig-compass": "^0.5.0",
|
|
79
78
|
"@types/async": "^3.2.7",
|
|
80
79
|
"@types/debug": "^4.1.7",
|
|
81
80
|
"@types/lodash": "^4.14.172",
|
|
@@ -87,15 +86,14 @@
|
|
|
87
86
|
"eslint": "^7.25.0",
|
|
88
87
|
"kerberos": "^2.0.0-beta.0",
|
|
89
88
|
"mocha": "^8.4.0",
|
|
90
|
-
"mongodb": "^4.
|
|
91
|
-
"mongodb-connection-model": "^21.10.0",
|
|
89
|
+
"mongodb": "^4.3.0",
|
|
92
90
|
"mongodb-runner": "^4.8.3",
|
|
93
91
|
"nyc": "^15.0.0",
|
|
94
92
|
"prettier": "2.3.2",
|
|
95
93
|
"rimraf": "^3.0.2",
|
|
96
94
|
"sinon": "^9.2.3",
|
|
97
|
-
"storage-mixin": "^4.
|
|
95
|
+
"storage-mixin": "^4.10.0",
|
|
98
96
|
"typescript": "^4.3.5"
|
|
99
97
|
},
|
|
100
|
-
"gitHead": "
|
|
98
|
+
"gitHead": "38680b2f9463d22a71105b6a7721883feecd54c9"
|
|
101
99
|
}
|