@mongodb-js/devtools-connect 2.2.0 → 2.3.0
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/.esm-wrapper.mjs +1 -0
- package/lib/connect.js +20 -2
- package/lib/connect.js.map +1 -1
- package/lib/index.d.ts +1 -0
- package/lib/index.js +3 -1
- package/lib/index.js.map +1 -1
- package/lib/types.d.ts +1 -0
- package/package.json +3 -3
package/.esm-wrapper.mjs
CHANGED
package/lib/connect.js
CHANGED
|
@@ -203,6 +203,7 @@ class DevtoolsConnectionState {
|
|
|
203
203
|
}
|
|
204
204
|
else {
|
|
205
205
|
const proxyingLogger = new events_1.default();
|
|
206
|
+
proxyingLogger.setMaxListeners(Infinity);
|
|
206
207
|
proxyingLogger.emit = function (event, ...args) {
|
|
207
208
|
logger.emit(event, ...args);
|
|
208
209
|
return events_1.default.prototype.emit.call(this, event, ...args);
|
|
@@ -254,7 +255,7 @@ async function connectMongoClient(uri, clientOptions, logger, MongoClientClass)
|
|
|
254
255
|
delete optionsWithoutFLE.autoEncryption;
|
|
255
256
|
delete optionsWithoutFLE.serverApi;
|
|
256
257
|
const client = new MongoClientClass(uri, optionsWithoutFLE);
|
|
257
|
-
state
|
|
258
|
+
closeMongoClientWhenAuthFails(state, client);
|
|
258
259
|
await connectWithFailFast(uri, client, logger);
|
|
259
260
|
const buildInfo = await client.db('admin').admin().command({ buildInfo: 1 });
|
|
260
261
|
await client.close();
|
|
@@ -265,7 +266,7 @@ async function connectMongoClient(uri, clientOptions, logger, MongoClientClass)
|
|
|
265
266
|
}
|
|
266
267
|
uri = await resolveMongodbSrv(uri, logger);
|
|
267
268
|
const client = new MongoClientClass(uri, mongoClientOptions);
|
|
268
|
-
state
|
|
269
|
+
closeMongoClientWhenAuthFails(state, client);
|
|
269
270
|
await connectWithFailFast(uri, client, logger);
|
|
270
271
|
if (client.autoEncrypter) {
|
|
271
272
|
client.autoEncrypter[Symbol.for('@@mdb.decorateDecryptionResult')] = true;
|
|
@@ -290,4 +291,21 @@ function isHumanOidcFlow(uri, clientOptions) {
|
|
|
290
291
|
return authMechanism === 'MONGODB-OIDC' && !new mongodb_connection_string_url_1.CommaAndColonSeparatedRecord(sp.get('authMechanismProperties')).get('PROVIDER_NAME');
|
|
291
292
|
}
|
|
292
293
|
exports.isHumanOidcFlow = isHumanOidcFlow;
|
|
294
|
+
function closeMongoClientWhenAuthFails(state, client) {
|
|
295
|
+
const originalClose = client.close;
|
|
296
|
+
client.close = async function (...args) {
|
|
297
|
+
let closeEmitted = false;
|
|
298
|
+
const onClose = () => closeEmitted = true;
|
|
299
|
+
this.on('close', onClose);
|
|
300
|
+
const result = await originalClose.call(this, ...args);
|
|
301
|
+
this.off('close', onClose);
|
|
302
|
+
if (!closeEmitted) {
|
|
303
|
+
this.emit('close');
|
|
304
|
+
}
|
|
305
|
+
return result;
|
|
306
|
+
};
|
|
307
|
+
const onOIDCAuthFailed = () => client.close().catch(() => { });
|
|
308
|
+
state.oidcPlugin.logger.once('mongodb-oidc-plugin:auth-failed', onOIDCAuthFailed);
|
|
309
|
+
client.once('close', () => state.oidcPlugin.logger.off?.('mongodb-oidc-plugin:auth-failed', onOIDCAuthFailed));
|
|
310
|
+
}
|
|
293
311
|
//# sourceMappingURL=connect.js.map
|
package/lib/connect.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connect.js","sourceRoot":"","sources":["../src/connect.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"connect.js","sourceRoot":"","sources":["../src/connect.ts"],"names":[],"mappings":"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"}
|
package/lib/index.d.ts
CHANGED
package/lib/index.js
CHANGED
|
@@ -14,10 +14,12 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
|
14
14
|
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
15
15
|
};
|
|
16
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
|
-
exports.hookLogger = exports.connectMongoClient = void 0;
|
|
17
|
+
exports.oidcServerRequestHandler = exports.hookLogger = exports.connectMongoClient = void 0;
|
|
18
18
|
__exportStar(require("./types"), exports);
|
|
19
19
|
var connect_1 = require("./connect");
|
|
20
20
|
Object.defineProperty(exports, "connectMongoClient", { enumerable: true, get: function () { return connect_1.connectMongoClient; } });
|
|
21
21
|
var log_hook_1 = require("./log-hook");
|
|
22
22
|
Object.defineProperty(exports, "hookLogger", { enumerable: true, get: function () { return log_hook_1.hookLogger; } });
|
|
23
|
+
var handler_1 = require("./oidc/handler");
|
|
24
|
+
Object.defineProperty(exports, "oidcServerRequestHandler", { enumerable: true, get: function () { return handler_1.oidcServerRequestHandler; } });
|
|
23
25
|
//# sourceMappingURL=index.js.map
|
package/lib/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,0CAAwB;AACxB,qCAA+C;AAAtC,6GAAA,kBAAkB,OAAA;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,0CAAwB;AACxB,qCAA+C;AAAtC,6GAAA,kBAAkB,OAAA;AAK3B,uCAAwC;AAA/B,sGAAA,UAAU,OAAA;AACnB,0CAA0D;AAAjD,mHAAA,wBAAwB,OAAA"}
|
package/lib/types.d.ts
CHANGED
|
@@ -62,6 +62,7 @@ export interface ConnectEventMap extends MongoDBOIDCLogEventsMap {
|
|
|
62
62
|
export type ConnectEventArgs<K extends keyof ConnectEventMap> = ConnectEventMap[K] extends (...args: infer P) => any ? P : never;
|
|
63
63
|
export interface ConnectLogEmitter {
|
|
64
64
|
on<K extends keyof ConnectEventMap>(event: K, listener: ConnectEventMap[K]): this;
|
|
65
|
+
off?<K extends keyof ConnectEventMap>(event: K, listener: ConnectEventMap[K]): this;
|
|
65
66
|
once<K extends keyof ConnectEventMap>(event: K, listener: ConnectEventMap[K]): this;
|
|
66
67
|
emit<K extends keyof ConnectEventMap>(event: K, ...args: ConnectEventArgs<K>): unknown;
|
|
67
68
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@mongodb-js/devtools-connect",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.3.0",
|
|
4
4
|
"description": "A connection establishment utility for MongoDB developer tools",
|
|
5
5
|
"homepage": "https://github.com/mongodb-js/devtools-connect",
|
|
6
6
|
"repository": {
|
|
@@ -42,11 +42,11 @@
|
|
|
42
42
|
"peerDependencies": {
|
|
43
43
|
"mongodb": "^5.4.0",
|
|
44
44
|
"mongodb-log-writer": "^1.2.0",
|
|
45
|
-
"@mongodb-js/oidc-plugin": "^0.2.
|
|
45
|
+
"@mongodb-js/oidc-plugin": "^0.2.4"
|
|
46
46
|
},
|
|
47
47
|
"devDependencies": {
|
|
48
48
|
"@mongodb-js/compass-components": "^1.6.0",
|
|
49
|
-
"@mongodb-js/oidc-plugin": "^0.2.
|
|
49
|
+
"@mongodb-js/oidc-plugin": "^0.2.4",
|
|
50
50
|
"@types/lodash.merge": "^4.6.7",
|
|
51
51
|
"@types/mocha": "^9.0.0",
|
|
52
52
|
"@types/node": "^16.4.10",
|