@mongosh/service-provider-core 3.6.0 → 3.6.2

package/AUTHORS

@@ -23,3 +23,4 @@ mongodb-devtools-bot[bot] <189715634+mongodb-devtools-bot[bot]@users.noreply.git
 Ubuntu <ubuntu@ip-10-0-5-160.ec2.internal>
 Ubuntu <ubuntu@ip-10-0-4-95.ec2.internal>
 Nikola Irinchev <irinchev@me.com>
+Kræn Hansen <mail@kraenhansen.dk>

package/lib/admin.d.ts

@@ -28,6 +28,7 @@ export default interface Admin {
     platform: ReplPlatform;
     initialDb: string;
     bsonLibrary: BSON;
+    computeLegacyHexMD5?(str: string): Promise<string>;
     listDatabases(database: string, options?: ListDatabasesOptions): Promise<Document>;
     getNewConnection(uri: string, options: MongoClientOptions): Promise<any>;
     getURI(): string | undefined;

package/lib/connect-info.d.ts

@@ -21,10 +21,11 @@ export type HostInformation = {
     is_atlas_url?: boolean;
     is_do_url?: boolean;
 };
-export default function getConnectExtraInfo({ connectionString, buildInfo, atlasVersion, resolvedHostname, isLocalAtlas, }: {
+export default function getConnectExtraInfo({ connectionString, buildInfo, atlasVersion, resolvedHostname, isLocalAtlas, serverName, }: {
     connectionString?: ConnectionString;
     buildInfo: any;
     atlasVersion: any;
     resolvedHostname?: string;
     isLocalAtlas: boolean;
+    serverName?: string;
 }): ConnectionExtraInfo;

package/lib/connect-info.js

@@ -1,10 +1,40 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (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 () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = getConnectExtraInfo;
-const mongodb_build_info_1 = __importDefault(require("mongodb-build-info"));
+const getBuildInfo = __importStar(require("mongodb-build-info"));
 function getHostInformation(host) {
     if (!host) {
         return {
@@ -13,14 +43,14 @@ function getHostInformation(host) {
             is_atlas_url: false,
         };
     }
-    if (mongodb_build_info_1.default.isLocalhost(host)) {
+    if (getBuildInfo.isLocalhost(host)) {
         return {
             is_localhost: true,
             is_do_url: false,
             is_atlas_url: false,
         };
     }
-    if (mongodb_build_info_1.default.isDigitalOcean(host)) {
+    if (getBuildInfo.isDigitalOcean(host)) {
         return {
             is_localhost: false,
             is_do_url: true,
@@ -30,34 +60,33 @@ function getHostInformation(host) {
     return {
         is_localhost: false,
         is_do_url: false,
-        is_atlas_url: mongodb_build_info_1.default.isAtlas(host),
+        is_atlas_url: getBuildInfo.isAtlas(host),
     };
 }
-function getConnectExtraInfo({ connectionString, buildInfo, atlasVersion, resolvedHostname, isLocalAtlas, }) {
+function getConnectExtraInfo({ connectionString, buildInfo, atlasVersion, resolvedHostname, isLocalAtlas, serverName = 'unknown', }) {
     var _a, _b, _c;
     const auth_type = (_a = connectionString === null || connectionString === void 0 ? void 0 : connectionString.searchParams.get('authMechanism')) !== null && _a !== void 0 ? _a : undefined;
     const uri = (_b = connectionString === null || connectionString === void 0 ? void 0 : connectionString.toString()) !== null && _b !== void 0 ? _b : '';
     buildInfo !== null && buildInfo !== void 0 ? buildInfo : (buildInfo = {});
-    const { isGenuine: is_genuine, serverName: non_genuine_server_name } = mongodb_build_info_1.default.getGenuineMongoDB(uri);
-    const { isDataLake: is_data_federation, dlVersion: dl_version } = mongodb_build_info_1.default.getDataLake(buildInfo);
-    const { serverOs: server_os, serverArch: server_arch } = mongodb_build_info_1.default.getBuildEnv(buildInfo);
-    const isAtlas = !!(atlasVersion === null || atlasVersion === void 0 ? void 0 : atlasVersion.atlasVersion) || mongodb_build_info_1.default.isAtlas(uri);
+    const { isDataLake: is_data_federation, dlVersion } = getBuildInfo.getDataLake(buildInfo);
+    const { serverOs, serverArch } = getBuildInfo.getBuildEnv(buildInfo);
+    const isAtlas = !!(atlasVersion === null || atlasVersion === void 0 ? void 0 : atlasVersion.atlasVersion) || getBuildInfo.isAtlas(uri);
     return {
         ...getHostInformation(resolvedHostname || uri),
         is_atlas: isAtlas,
         server_version: buildInfo.version,
         node_version: process.version,
-        server_os,
+        server_os: serverOs || undefined,
         uri,
-        server_arch,
-        is_enterprise: mongodb_build_info_1.default.isEnterprise(buildInfo),
+        server_arch: serverArch || undefined,
+        is_enterprise: getBuildInfo.isEnterprise(buildInfo),
         auth_type,
         is_data_federation,
-        is_stream: mongodb_build_info_1.default.isAtlasStream(uri),
-        dl_version,
+        is_stream: getBuildInfo.isAtlasStream(uri),
+        dl_version: dlVersion || undefined,
         atlas_version: (_c = atlasVersion === null || atlasVersion === void 0 ? void 0 : atlasVersion.atlasVersion) !== null && _c !== void 0 ? _c : null,
-        is_genuine,
-        non_genuine_server_name,
+        is_genuine: serverName === 'mongodb' || serverName === 'unknown',
+        non_genuine_server_name: serverName,
         is_local_atlas: isLocalAtlas,
     };
 }

package/lib/connect-info.js.map

@@ -1 +1 @@
-{"version":3,"file":"connect-info.js","sourceRoot":"","sources":["../src/connect-info.ts"],"names":[],"mappings":";;;;;AA6DA,sCA8CC;AAzGD,4EAA8C;AA2B9C,SAAS,kBAAkB,CAAC,IAAa;IACvC,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,OAAO;YACL,YAAY,EAAE,KAAK;YACnB,SAAS,EAAE,KAAK;YAChB,YAAY,EAAE,KAAK;SACpB,CAAC;IACJ,CAAC;IAED,IAAI,4BAAY,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,CAAC;QACnC,OAAO;YACL,YAAY,EAAE,IAAI;YAClB,SAAS,EAAE,KAAK;YAChB,YAAY,EAAE,KAAK;SACpB,CAAC;IACJ,CAAC;IAED,IAAI,4BAAY,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE,CAAC;QACtC,OAAO;YACL,YAAY,EAAE,KAAK;YACnB,SAAS,EAAE,IAAI;YACf,YAAY,EAAE,KAAK;SACpB,CAAC;IACJ,CAAC;IAED,OAAO;QACL,YAAY,EAAE,KAAK;QACnB,SAAS,EAAE,KAAK;QAChB,YAAY,EAAE,4BAAY,CAAC,OAAO,CAAC,IAAI,CAAC;KACzC,CAAC;AACJ,CAAC;AAED,SAAwB,mBAAmB,CAAC,EAC1C,gBAAgB,EAChB,SAAS,EACT,YAAY,EACZ,gBAAgB,EAChB,YAAY,GAOb;;IACC,MAAM,SAAS,GACb,MAAA,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,YAAY,CAAC,GAAG,CAAC,eAAe,CAAC,mCAAI,SAAS,CAAC;IACnE,MAAM,GAAG,GAAG,MAAA,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,QAAQ,EAAE,mCAAI,EAAE,CAAC;IAE/C,SAAS,aAAT,SAAS,cAAT,SAAS,IAAT,SAAS,GAAK,EAAE,EAAC;IACjB,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,UAAU,EAAE,uBAAuB,EAAE,GAClE,4BAAY,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC;IAEtC,MAAM,EAAE,UAAU,EAAE,kBAAkB,EAAE,SAAS,EAAE,UAAU,EAAE,GAC7D,4BAAY,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;IAEtC,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,UAAU,EAAE,WAAW,EAAE,GACpD,4BAAY,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;IACtC,MAAM,OAAO,GAAG,CAAC,CAAC,CAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,YAAY,CAAA,IAAI,4BAAY,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IAE1E,OAAO;QACL,GAAG,kBAAkB,CAAC,gBAAgB,IAAI,GAAG,CAAC;QAC9C,QAAQ,EAAE,OAAO;QACjB,cAAc,EAAE,SAAS,CAAC,OAAO;QACjC,YAAY,EAAE,OAAO,CAAC,OAAO;QAC7B,SAAS;QACT,GAAG;QACH,WAAW;QACX,aAAa,EAAE,4BAAY,CAAC,YAAY,CAAC,SAAS,CAAC;QACnD,SAAS;QACT,kBAAkB;QAClB,SAAS,EAAE,4BAAY,CAAC,aAAa,CAAC,GAAG,CAAC;QAC1C,UAAU;QACV,aAAa,EAAE,MAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,YAAY,mCAAI,IAAI;QACjD,UAAU;QACV,uBAAuB;QACvB,cAAc,EAAE,YAAY;KAC7B,CAAC;AACJ,CAAC"}
+{"version":3,"file":"connect-info.js","sourceRoot":"","sources":["../src/connect-info.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA6DA,sCA6CC;AAxGD,iEAAmD;AA2BnD,SAAS,kBAAkB,CAAC,IAAa;IACvC,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,OAAO;YACL,YAAY,EAAE,KAAK;YACnB,SAAS,EAAE,KAAK;YAChB,YAAY,EAAE,KAAK;SACpB,CAAC;IACJ,CAAC;IAED,IAAI,YAAY,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,CAAC;QACnC,OAAO;YACL,YAAY,EAAE,IAAI;YAClB,SAAS,EAAE,KAAK;YAChB,YAAY,EAAE,KAAK;SACpB,CAAC;IACJ,CAAC;IAED,IAAI,YAAY,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE,CAAC;QACtC,OAAO;YACL,YAAY,EAAE,KAAK;YACnB,SAAS,EAAE,IAAI;YACf,YAAY,EAAE,KAAK;SACpB,CAAC;IACJ,CAAC;IAED,OAAO;QACL,YAAY,EAAE,KAAK;QACnB,SAAS,EAAE,KAAK;QAChB,YAAY,EAAE,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC;KACzC,CAAC;AACJ,CAAC;AAED,SAAwB,mBAAmB,CAAC,EAC1C,gBAAgB,EAChB,SAAS,EACT,YAAY,EACZ,gBAAgB,EAChB,YAAY,EACZ,UAAU,GAAG,SAAS,GAQvB;;IACC,MAAM,SAAS,GACb,MAAA,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,YAAY,CAAC,GAAG,CAAC,eAAe,CAAC,mCAAI,SAAS,CAAC;IACnE,MAAM,GAAG,GAAG,MAAA,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,QAAQ,EAAE,mCAAI,EAAE,CAAC;IAE/C,SAAS,aAAT,SAAS,cAAT,SAAS,IAAT,SAAS,GAAK,EAAE,EAAC;IAEjB,MAAM,EAAE,UAAU,EAAE,kBAAkB,EAAE,SAAS,EAAE,GACjD,YAAY,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;IAEtC,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE,GAAG,YAAY,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;IACrE,MAAM,OAAO,GAAG,CAAC,CAAC,CAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,YAAY,CAAA,IAAI,YAAY,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IAE1E,OAAO;QACL,GAAG,kBAAkB,CAAC,gBAAgB,IAAI,GAAG,CAAC;QAC9C,QAAQ,EAAE,OAAO;QACjB,cAAc,EAAE,SAAS,CAAC,OAAO;QACjC,YAAY,EAAE,OAAO,CAAC,OAAO;QAC7B,SAAS,EAAE,QAAQ,IAAI,SAAS;QAChC,GAAG;QACH,WAAW,EAAE,UAAU,IAAI,SAAS;QACpC,aAAa,EAAE,YAAY,CAAC,YAAY,CAAC,SAAS,CAAC;QACnD,SAAS;QACT,kBAAkB;QAClB,SAAS,EAAE,YAAY,CAAC,aAAa,CAAC,GAAG,CAAC;QAC1C,UAAU,EAAE,SAAS,IAAI,SAAS;QAClC,aAAa,EAAE,MAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,YAAY,mCAAI,IAAI;QACjD,UAAU,EAAE,UAAU,KAAK,SAAS,IAAI,UAAU,KAAK,SAAS;QAChE,uBAAuB,EAAE,UAAU;QACnC,cAAc,EAAE,YAAY;KAC7B,CAAC;AACJ,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mongosh/service-provider-core",
-  "version": "3.6.0",
+  "version": "3.6.2",
   "description": "MongoDB Shell Core Service Provider Package",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -37,10 +37,10 @@
   },
   "dependencies": {
     "@mongosh/errors": "2.4.4",
-    "@mongosh/shell-bson": "1.0.1",
+    "@mongosh/shell-bson": "1.0.3",
     "bson": "^6.10.4",
     "mongodb": "^6.19.0",
-    "mongodb-build-info": "^1.7.2",
+    "mongodb-build-info": "^1.8.1",
     "mongodb-connection-string-url": "^3.0.2"
   },
   "devDependencies": {
@@ -51,5 +51,5 @@
     "eslint": "^7.25.0",
     "prettier": "^2.8.8"
   },
-  "gitHead": "9f0183e375c5422a0e1ced87c9a620384180abf7"
+  "gitHead": "3e3db3cca3d2971afd86e509341198becd05f30c"
 }

package/src/admin.ts

@@ -66,6 +66,12 @@ export default interface Admin {
    */
   bsonLibrary: BSON;
 
+  /**
+   * Compute a hex MD5 hash from a string. Used for legacy auth mechanisms such as
+   * SCRAM-SHA-1.
+   */
+  computeLegacyHexMD5?(str: string): Promise<string>;
+
   /**
    * list databases.
    *

package/src/connect-info.spec.ts

@@ -64,7 +64,7 @@ describe('getConnectInfo', function () {
       auth_type: 'PLAIN',
       is_data_federation: false,
       is_stream: false,
-      dl_version: null,
+      dl_version: undefined,
       atlas_version: '20210330.0.0.1617063608',
       is_genuine: true,
       non_genuine_server_name: 'mongodb',
@@ -81,6 +81,7 @@ describe('getConnectInfo', function () {
         atlasVersion: ATLAS_VERSION,
         resolvedHostname: 'test-data-sets-00-02-a011bb.mongodb.net',
         isLocalAtlas: false,
+        serverName: 'mongodb',
       })
     ).to.deep.equal(output);
   });
@@ -96,7 +97,7 @@ describe('getConnectInfo', function () {
       auth_type: undefined,
       is_data_federation: false,
       is_stream: false,
-      dl_version: null,
+      dl_version: undefined,
       atlas_version: '20210330.0.0.1617063608',
       is_genuine: true,
       non_genuine_server_name: 'mongodb',
@@ -113,6 +114,7 @@ describe('getConnectInfo', function () {
         atlasVersion: ATLAS_VERSION,
         resolvedHostname: 'test-data-sets-00-02-a011bb.mongodb.net',
         isLocalAtlas: false,
+        serverName: 'mongodb',
       })
     ).to.deep.equal(output);
   });
@@ -130,7 +132,7 @@ describe('getConnectInfo', function () {
       auth_type: undefined,
       is_data_federation: false,
       is_stream: true,
-      dl_version: null,
+      dl_version: undefined,
       atlas_version: null,
       is_genuine: true,
       is_local_atlas: false,
@@ -148,6 +150,7 @@ describe('getConnectInfo', function () {
         resolvedHostname:
           'atlas-stream-67b8e1cd6d60357be377be7b-1dekw.virginia-usa.a.query.mongodb-dev.net',
         isLocalAtlas: false,
+        serverName: 'mongodb',
       })
     ).to.deep.equal(output);
   });
@@ -163,7 +166,7 @@ describe('getConnectInfo', function () {
       auth_type: undefined,
       is_data_federation: false,
       is_stream: false,
-      dl_version: null,
+      dl_version: undefined,
       atlas_version: null,
       is_genuine: true,
       non_genuine_server_name: 'mongodb',
@@ -179,6 +182,7 @@ describe('getConnectInfo', function () {
         atlasVersion: null,
         resolvedHostname: 'localhost',
         isLocalAtlas: true,
+        serverName: 'mongodb',
       })
     ).to.deep.equal(output);
   });
@@ -194,13 +198,13 @@ describe('getConnectInfo', function () {
       auth_type: undefined,
       is_data_federation: false,
       is_stream: false,
-      dl_version: null,
+      dl_version: undefined,
       atlas_version: null,
       is_genuine: true,
       non_genuine_server_name: 'mongodb',
-      server_arch: null,
       node_version: process.version,
-      server_os: null,
+      server_os: undefined,
+      server_arch: undefined,
       uri: '',
       is_local_atlas: false,
     };
@@ -209,6 +213,7 @@ describe('getConnectInfo', function () {
         buildInfo: null,
         atlasVersion: null,
         isLocalAtlas: false,
+        serverName: 'mongodb',
       })
     ).to.deep.equal(output);
   });

package/src/connect-info.ts

@@ -1,6 +1,6 @@
 // ^ segment data is in snake_case: forgive me javascript, for i have sinned.
 
-import getBuildInfo from 'mongodb-build-info';
+import * as getBuildInfo from 'mongodb-build-info';
 import type { ConnectionString } from 'mongodb-connection-string-url';
 
 export type ConnectionExtraInfo = {
@@ -65,26 +65,25 @@ export default function getConnectExtraInfo({
   atlasVersion,
   resolvedHostname,
   isLocalAtlas,
+  serverName = 'unknown',
 }: {
   connectionString?: ConnectionString;
   buildInfo: any;
   atlasVersion: any;
   resolvedHostname?: string;
   isLocalAtlas: boolean;
+  serverName?: string;
 }): ConnectionExtraInfo {
   const auth_type =
     connectionString?.searchParams.get('authMechanism') ?? undefined;
   const uri = connectionString?.toString() ?? '';
 
   buildInfo ??= {}; // We're currently not getting buildInfo with --apiStrict.
-  const { isGenuine: is_genuine, serverName: non_genuine_server_name } =
-    getBuildInfo.getGenuineMongoDB(uri);
   // Atlas Data Lake has been renamed to Atlas Data Federation
-  const { isDataLake: is_data_federation, dlVersion: dl_version } =
+  const { isDataLake: is_data_federation, dlVersion } =
     getBuildInfo.getDataLake(buildInfo);
 
-  const { serverOs: server_os, serverArch: server_arch } =
-    getBuildInfo.getBuildEnv(buildInfo);
+  const { serverOs, serverArch } = getBuildInfo.getBuildEnv(buildInfo);
   const isAtlas = !!atlasVersion?.atlasVersion || getBuildInfo.isAtlas(uri);
 
   return {
@@ -92,17 +91,17 @@ export default function getConnectExtraInfo({
     is_atlas: isAtlas,
     server_version: buildInfo.version,
     node_version: process.version,
-    server_os,
+    server_os: serverOs || undefined,
     uri,
-    server_arch,
+    server_arch: serverArch || undefined,
     is_enterprise: getBuildInfo.isEnterprise(buildInfo),
     auth_type,
     is_data_federation,
     is_stream: getBuildInfo.isAtlasStream(uri),
-    dl_version,
+    dl_version: dlVersion || undefined,
     atlas_version: atlasVersion?.atlasVersion ?? null,
-    is_genuine,
-    non_genuine_server_name,
+    is_genuine: serverName === 'mongodb' || serverName === 'unknown',
+    non_genuine_server_name: serverName,
     is_local_atlas: isLocalAtlas,
   };
 }