optimized most common objectId usage new ObjectId()

Author: christkv

lib/bson/objectid.js

@@ -10,6 +10,12 @@ var MACHINE_ID = parseInt(Math.random() * 0xFFFFFF, 10);
 
 // Regular expression that checks for hex value
 var checkForHexRegExp = new RegExp("^[0-9a-fA-F]{24}$");
+var hasBufferType = false;
+
+// Check if buffer exists
+try {
+  if(Buffer && Buffer.from) hasBufferType = true;
+} catch(err) {};
 
 /**
 * Create a new ObjectID instance
@@ -26,17 +32,26 @@ var ObjectID = function ObjectID(id) {
 
   this._bsontype = 'ObjectID';
 
-  var __id = null;
+  // The most common usecase (blank id, new objectId instance)
+  if(id == null || typeof id == 'number') {
+    // Generate a new id
+    this.id = this.generate(id);
+    // If we are caching the hex string
+    if(ObjectID.cacheHexString) this.__id = this.toString('hex');
+    // Return the object
+    return;
+  }
+
+  // Check if the passed in id is valid
   var valid = ObjectID.isValid(id);
 
   // Throw an error if it's not a valid setup
   if(!valid && id != null){
     throw new Error("Argument passed in must be a single String of 12 bytes or a string of 24 hex characters");
+  } else if(valid && typeof id == 'string' && id.length == 24 && hasBufferType) {
+    return new ObjectID(Buffer.from(id, 'hex'));
   } else if(valid && typeof id == 'string' && id.length == 24) {
     return ObjectID.createFromHexString(id);
-  } else if(id == null || typeof id == 'number') {
-    // convert to 12 byte binary string
-    this.id = this.generate(id);
   } else if(id != null && id.length === 12) {
     // assume 12 byte string
     this.id = id;
@@ -47,7 +62,7 @@ var ObjectID = function ObjectID(id) {
     throw new Error("Argument passed in must be a single String of 12 bytes or a string of 24 hex characters");
   }
 
-  if(ObjectID.cacheHexString) this.__id = this.toHexString();
+  if(ObjectID.cacheHexString) this.__id = this.toString('hex');
 };
 
 // Allow usage of ObjectId as well as ObjectID
@@ -155,7 +170,7 @@ ObjectID.prototype.generate = function(time) {
 */
 ObjectID.prototype.toString = function(format) {
   // Is the id a buffer then use the buffer toString method to return the format
-  if(this.id instanceof Buffer) {
+  if(this.id && this.id.copy) {
     return this.id.toString(format || 'hex');
   }