Replaced mongodb.ObjectId() with the functions from mongo_utils.js

aayushchouhan09 · aayushchouhan09 · commit 979a056533f8 · 2025-09-15T19:25:08.000+05:30
Signed-off-by: Aayush Chouhan &lt;achouhan@redhat.com&gt;
diff --git a/src/agent/block_store_speed.js b/src/agent/block_store_speed.js
@@ -4,7 +4,7 @@
 // const _ = require('lodash');
 const argv = require('minimist')(process.argv);
 const cluster = require('cluster');
-const mongodb = require('mongodb');
+const mongo_utils = require('../util/mongo_utils');
 
 const api = require('../api');
 const config = require('../../config');
@@ -61,7 +61,7 @@ async function worker(client) {
 }
 
 async function write_block(client) {
-    const block_id = new mongodb.ObjectId();
+    const block_id = new mongo_utils.ObjectId();
     return client.block_store.write_block({
         [RPC_BUFFERS]: { data: Buffer.allocUnsafe(argv.size) },
         block_md: {
diff --git a/src/sdk/nb.d.ts b/src/sdk/nb.d.ts
@@ -46,7 +46,7 @@ interface Base {
     toString?(): string;
 }
 
-type ID = mongodb.ObjectID;
+type ID = string;
 type DBBuffer = mongodb.Binary | Buffer;
 
 interface System extends Base {
diff --git a/src/server/analytic_services/history_data_store.js b/src/server/analytic_services/history_data_store.js
@@ -1,7 +1,7 @@
 /* Copyright (C) 2016 NooBaa */
 'use strict';
 
-const mongodb = require('mongodb');
+const mongo_utils = require('../../util/mongo_utils');
 
 // const dbg = require('../../util/debug_module')(__filename);
 const config = require('../../../config.js');
@@ -30,7 +30,7 @@ class HistoryDataStore {
             const time_stamp = new Date();
             const record_expiration_date = new Date(time_stamp.getTime() - config.STATISTICS_COLLECTOR_EXPIRATION);
             const record = {
-                _id: new mongodb.ObjectId(),
+                _id: new mongo_utils.ObjectId(),
                 time_stamp,
                 system_snapshot: item,
                 history_type: 'SYSTEM'
diff --git a/src/server/bg_services/mirror_writer.js b/src/server/bg_services/mirror_writer.js
@@ -3,7 +3,7 @@
 
 const util = require('util');
 const _ = require('lodash');
-const { ObjectId } = require('mongodb');
+const { ObjectId } = require('../../util/mongo_utils');
 
 const config = require('../../../config');
 const dbg = require('../../util/debug_module')(__filename);
diff --git a/src/server/node_services/nodes_store.js b/src/server/node_services/nodes_store.js
@@ -2,7 +2,7 @@
 'use strict';
 
 const _ = require('lodash');
-const mongodb = require('mongodb');
+const mongo_utils = require('../../util/mongo_utils');
 
 const dbg = require('../../util/debug_module')(__filename);
 const node_schema = require('./node_schema');
@@ -24,7 +24,7 @@ class NodesStore {
     }
 
     make_node_id(id_str) {
-        return new mongodb.ObjectId(id_str);
+        return new mongo_utils.ObjectId(id_str);
     }
 
     is_connected() {
diff --git a/src/server/notifications/alerts_log_store.js b/src/server/notifications/alerts_log_store.js
@@ -1,7 +1,7 @@
 /* Copyright (C) 2016 NooBaa */
 'use strict';
 
-const mongodb = require('mongodb');
+const mongo_utils = require('../../util/mongo_utils');
 const _ = require('lodash');
 const P = require('../../util/promise');
 const db_client = require('../../util/db_client');
@@ -23,7 +23,7 @@ class AlertsLogStore {
     }
 
     make_alert_log_id(id_str) {
-        return new mongodb.ObjectID(id_str);
+        return new mongo_utils.ObjectId(id_str);
     }
 
     create(alert_log) {
@@ -94,12 +94,12 @@ class AlertsLogStore {
 
         let _id;
         if (ids) {
-            const obj_ids = ids.map(id => new mongodb.ObjectID(id));
+            const obj_ids = ids.map(id => new mongo_utils.ObjectId(id));
             _id = { $in: obj_ids };
         } else if (till) {
-            _id = { $lt: new mongodb.ObjectID(till) };
+            _id = { $lt: new mongo_utils.ObjectId(till) };
         } else if (since) {
-            _id = { $gt: new mongodb.ObjectID(since) };
+            _id = { $gt: new mongo_utils.ObjectId(since) };
         }
 
         return _.omitBy({
diff --git a/src/server/object_services/md_store.js b/src/server/object_services/md_store.js
@@ -7,7 +7,7 @@
 const _ = require('lodash');
 const assert = require('assert');
 const moment = require('moment');
-const mongodb = require('mongodb');
+const mongo_utils = require('../../util/mongo_utils');
 const mime = require('mime-types');
 
 const P = require('../../util/promise');
@@ -92,18 +92,18 @@ class MDStore {
         if (zero_suffix) {
             suffix = '0'.repeat(16);
         } else {
-            suffix = String(new mongodb.ObjectId()).slice(8, 24);
+            suffix = String(new mongo_utils.ObjectId()).slice(8, 24);
         }
         const hex_id = padded_hex_time + suffix;
         assert(padded_hex_time.length === 8);
         assert(suffix.length === 16);
         assert(hex_id.length === 24);
         assert(parseInt(padded_hex_time, 16) === Math.floor(time / 1000));
-        return new mongodb.ObjectId(hex_id);
+        return new mongo_utils.ObjectId(hex_id);
     }
 
     is_valid_md_id(id_str) {
-        return mongodb.ObjectId.isValid(id_str);
+        return mongo_utils.ObjectId.isValid(id_str);
     }
 
     /////////////
@@ -2113,7 +2113,7 @@ function sort_list_uploads_with_delimiter(a, b) {
  * @returns {nb.ID}
  */
 function make_md_id(id_str) {
-    return new mongodb.ObjectId(id_str);
+    return new mongo_utils.ObjectId(id_str);
 }
 
 
diff --git a/src/server/system_services/config_file_store.js b/src/server/system_services/config_file_store.js
@@ -4,7 +4,7 @@
 const _ = require('lodash');
 const dbg = require('../../util/debug_module')(__filename);
 const db_client = require('../../util/db_client');
-const mongodb = require('mongodb');
+const mongo_utils = require('../../util/mongo_utils');
 const config_file_schema = require('./schemas/config_file_schema');
 const config_file_indexes = require('./schemas/config_file_indexes');
 
@@ -26,7 +26,7 @@ class ConfigFileStore {
     async insert(item) {
         dbg.log0(`insert`, item);
         _.defaults(item, {
-            _id: new mongodb.ObjectId()
+            _id: new mongo_utils.ObjectId()
         });
         // There shouldn't be more than one record, this is being on the safe side
         this._config_files.validate(item);
diff --git a/src/server/system_services/replication_store.js b/src/server/system_services/replication_store.js
@@ -2,7 +2,7 @@
 'use strict';
 
 const _ = require('lodash');
-const mongodb = require('mongodb');
+const mongo_utils = require('../../util/mongo_utils');
 const db_client = require('../../util/db_client');
 const dbg = require('../../util/debug_module')(__filename);
 const replication_schema = require('./schemas/replication_configuration_schema');
@@ -25,7 +25,7 @@ class ReplicationStore {
         item = _.omitBy(item, _.isNil);
         dbg.log1(`insert_replication`, item);
         const record = {
-            _id: new mongodb.ObjectId(),
+            _id: new mongo_utils.ObjectId(),
             ...item
         };
         this._replicationconfigs.validate(record);
diff --git a/src/tools/md_blow_lifecycle.js b/src/tools/md_blow_lifecycle.js
@@ -2,7 +2,7 @@
 'use strict';
 
 const _ = require('lodash');
-const mongodb = require('mongodb');
+const mongo_utils = require('../util/mongo_utils');
 const argvParse = require('minimist');
 const P = require('../util/promise');
 const api = require('../api');
@@ -127,7 +127,7 @@ async function blow_version_objects() {
         const { obj_id } = await client.object.create_object_upload({ bucket: argv.bucket, key: argv.version_key, content_type });
         await client.object.complete_object_upload({ obj_id, bucket: argv.bucket, key: argv.version_key });
         if (i < argv.version_count - 2) {
-            obj_upload_ids.push(new mongodb.ObjectId(obj_id));
+            obj_upload_ids.push(new mongo_utils.ObjectId(obj_id));
         }
     }
 
@@ -199,7 +199,8 @@ async function blow_multipart_object(index) {
             create_time,
         };
         console.log('create_mock_multipart_upload bucket', argv.bucket, 'obj_id', params.obj_id, 'multiparts_ids', complete_params.multipart_id);
-        const update_result = await MDStore.instance().update_multipart_by_id(new mongodb.ObjectId(complete_params.multipart_id), update);
+        const update_result = await MDStore.instance().update_multipart_by_id(
+            new mongo_utils.ObjectId(complete_params.multipart_id), update);
         console.log('update_multiparts_by_ids', update_result);
     }
 
diff --git a/src/util/db_client.js b/src/util/db_client.js
@@ -2,7 +2,7 @@
 /** @typedef {typeof import('../sdk/nb')} nb */
 'use strict';
 
-const mongodb = require('mongodb');
+const mongo_utils = require('./mongo_utils');
 const { EventEmitter } = require('events');
 
 const dbg = require('./debug_module')(__filename);
@@ -36,8 +36,8 @@ class NoneDBClient extends EventEmitter {
     async populate(docs, doc_path, collection, fields) { return this.noop(); }
     resolve_object_ids_recursive(idmap, item) { return this.noop(); }
     resolve_object_ids_paths(idmap, item, paths, allow_missing) { return this.noop(); }
-    new_object_id() { return new mongodb.ObjectId(); }
-    parse_object_id(id_str) { return new mongodb.ObjectId(String(id_str || undefined)); }
+    new_object_id() { return new mongo_utils.ObjectId(); }
+    parse_object_id(id_str) { return new mongo_utils.ObjectId(String(id_str || undefined)); }
     fix_id_type(doc) { return doc; }
     is_object_id(id) { return false; }
     is_err_duplicate_key(err) { return false; }
diff --git a/src/util/mongo_utils.js b/src/util/mongo_utils.js
@@ -5,7 +5,7 @@
 
 // const _ = require('lodash');
 // const util = require('util');
-const mongodb = require('mongodb');
+// const mongodb = require('mongodb');
 
 // const { RpcError } = require('../rpc');
 
@@ -159,7 +159,7 @@ const mongodb = require('mongodb');
 // }
 
 function is_object_id(id) {
-    return (id instanceof mongodb.ObjectId);
+    return typeof id === 'string' && (/^[0-9a-f]{24}$/i).test(id);
 }
 
 function mongoObjectId() {
@@ -230,6 +230,44 @@ function mongoObjectId() {
 //     return client.db().command({ dbStats: 1 });
 // }
 
+/**
+ * MongoDB ObjectId compatibility class
+ * Behaves like mongodb.ObjectId but returns strings
+ */
+class ObjectID {
+    constructor(id_str) {
+        if (id_str === undefined || id_str === null) {
+            this._id = mongoObjectId();
+        } else {
+            this._id = String(id_str);
+        }
+    }
+
+    toString() {
+        return this._id;
+    }
+
+    toHexString() {
+        return this._id;
+    }
+
+    valueOf() {
+        return this._id;
+    }
+
+    toJSON() {
+        return this._id;
+    }
+
+    static isValid(id) {
+        return is_object_id(id);
+    }
+
+    static [Symbol.hasInstance](instance) {
+        return instance && typeof instance._id === 'string' && is_object_id(instance._id);
+    }
+}
+
 // // EXPORTS
 // exports.mongo_operators = mongo_operators;
 // exports.obj_ids_difference = obj_ids_difference;
@@ -249,4 +287,5 @@ exports.is_object_id = is_object_id;
 // exports.check_update_one = check_update_one;
 // exports.make_object_diff = make_object_diff;
 // exports.get_db_stats = get_db_stats;
+exports.ObjectId = ObjectID;
 exports.mongoObjectId = mongoObjectId;
diff --git a/src/util/postgres_client.js b/src/util/postgres_client.js
@@ -19,6 +19,7 @@ const common_api = require('../api/common_api');
 const schema_utils = require('./schema_utils');
 const schema_keywords = require('./schema_keywords');
 const mongodb = require('mongodb');
+const mongo_utils = require('./mongo_utils');
 const mongo_to_pg = require('mongo-query-to-postgres-jsonb');
 const fs = require('fs');
 // TODO: Shouldn't be like that, we shouldn't use MongoDB functions to compare
@@ -55,7 +56,7 @@ function decode_json(schema, val) {
         return val;
     }
     if (schema.objectid === true) {
-        return new mongodb.ObjectId(val);
+        return new mongo_utils.ObjectId(val);
     }
     if (schema.date === true) {
         return new Date(val);
@@ -98,7 +99,7 @@ function encode_json(schema, val) {
     const ops = handle_ops_encoding(schema, val);
     if (ops) return ops;
 
-    if (schema.objectid === true && val instanceof mongodb.ObjectID) {
+    if (schema.objectid === true && val instanceof mongo_utils.ObjectId) {
         return val.toString();
     }
 
@@ -1219,7 +1220,7 @@ class PostgresTable {
                 const new_row = {};
                 for (const key of Object.keys(row)) {
                     if (key === '_id') {
-                        new_row._id = new mongodb.ObjectID(row[key]);
+                        new_row._id = new mongo_utils.ObjectId(row[key]);
                     } else {
                         new_row[key] = parseInt(row[key], 10);
                     }
@@ -1658,7 +1659,7 @@ class PostgresClient extends EventEmitter {
     }
 
     generate_id() {
-        return new mongodb.ObjectId();
+        return new mongo_utils.ObjectId();
     }
 
     collection(name) {
@@ -1829,7 +1830,7 @@ class PostgresClient extends EventEmitter {
 
     resolve_object_ids_recursive(idmap, item) {
         _.each(item, (val, key) => {
-            if (val instanceof mongodb.ObjectId) {
+            if (val instanceof mongo_utils.ObjectId) {
                 if (key !== '_id') {
                     const obj = idmap[val.toHexString()];
                     if (obj) {
@@ -1868,28 +1869,28 @@ class PostgresClient extends EventEmitter {
      * @returns {nb.ID}
      */
     new_object_id() {
-        return new mongodb.ObjectId();
+        return new mongo_utils.ObjectId();
     }
 
     /**
      * @param {string} id_str
      * @returns {nb.ID}
      */
     parse_object_id(id_str) {
-        return new mongodb.ObjectId(String(id_str || undefined));
+        return new mongo_utils.ObjectId(String(id_str || undefined));
     }
 
     fix_id_type(doc) {
         if (_.isArray(doc)) {
             _.each(doc, d => this.fix_id_type(d));
         } else if (doc && doc._id) {
-            doc._id = new mongodb.ObjectId(doc._id);
+            doc._id = new mongo_utils.ObjectId(doc._id);
         }
         return doc;
     }
 
     is_object_id(id) {
-        return (id instanceof mongodb.ObjectId);
+        return (id instanceof mongo_utils.ObjectId);
     }
 
     // TODO: Figure out error codes

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ interface Base {`
`46`	`46`	`toString?(): string;`
`47`	`47`	`}`
`48`	`48`
`49`		`-type ID = mongodb.ObjectID;`
	`49`	`+type ID = string;`
`50`	`50`	`type DBBuffer = mongodb.Binary \| Buffer;`
`51`	`51`
`52`	`52`	`interface System extends Base {`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`'use strict';`
`3`	`3`
`4`	`4`	`const _ = require('lodash');`
`5`		`-const mongodb = require('mongodb');`
	`5`	`+const mongo_utils = require('../../util/mongo_utils');`
`6`	`6`
`7`	`7`	`const dbg = require('../../util/debug_module')(__filename);`
`8`	`8`	`const node_schema = require('./node_schema');`
`@@ -24,7 +24,7 @@ class NodesStore {`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`make_node_id(id_str) {`
`27`		`- return new mongodb.ObjectId(id_str);`
	`27`	`+ return new mongo_utils.ObjectId(id_str);`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`is_connected() {`