WIP

Author: W-A-James

src/mongo_logger.ts

@@ -1,3 +1,17 @@
+import {
+  type Binary,
+  type BSONRegExp,
+  type BSONSymbol,
+  type Code,
+  type DBRef,
+  type Decimal128,
+  type Double,
+  type Int32,
+  type Long,
+  type MaxKey,
+  type MinKey,
+  type Timestamp
+} from 'bson';
 import { inspect, promisify } from 'util';
 import { isUint8Array } from 'util/types';
 
@@ -414,6 +428,20 @@ export interface LogConvertible extends Record<string, any> {
   toLog(): Record<string, any>;
 }
 
+type BSONObject =
+  | BSONRegExp
+  | BSONSymbol
+  | Code
+  | DBRef
+  | Decimal128
+  | Double
+  | Int32
+  | Long
+  | MaxKey
+  | MinKey
+  | ObjectId
+  | Timestamp
+  | Binary;
 /** @internal */
 export function stringifyWithMaxLen(
   value: any,
@@ -432,36 +460,74 @@ export function stringifyWithMaxLen(
 
     if (typeof value === 'string') {
       currentLength += value.length;
-    } else if (typeof value === 'number' && Number.isInteger(value)) {
-      currentLength += Math.ceil(Math.log10(value));
     } else if (typeof value === 'number' || typeof value === 'bigint') {
       currentLength += String(value).length;
     } else if (typeof value === 'boolean') {
       currentLength += value ? 4 : 5;
+    } else if ('buffer' in value && isUint8Array(value.buffer)) {
+      // Handle binData
+      currentLength += (value.buffer.byteLength + value.buffer.byteLength * 0.5) | 0;
     } else if (value != null && typeof value === 'object' && '_bsontype' in value) {
-      if (isUint8Array(value.buffer)) {
-        currentLength += (value.buffer.byteLength + value.buffer.byteLength * 0.5) | 0;
-      } else if (value._bsontype === 'Binary') {
-        currentLength += (value.position + value.position * 0.3) | 0;
-      } else if (value._bsontype === 'Code') {
-        currentLength += value.code.length;
-      } else if (value._bsontype === 'Decimal128') {
-      } else if (value._bsontype === 'Double') {
-        if ('value' in value) currentLength += String(value.value).length;
-      } else if (value._bsontype === 'Int32') {
-        if ('value' in value) currentLength += String(value.value).length;
-      } else if (value._bsontype === 'Long') {
-        currentLength += value.toString;
-      } else if (value._bsontype === 'MaxKey') {
-        currentLength += 13;
-      } else if (value._bsontype === 'MinKey') {
+      const v = value as BSONObject;
+      if (v._bsontype === 'Binary') {
+        // This is an estimate based on the fact that the base64 is approximately 1.3x the length of
+        // the actual binary sequence
+        // Also accounting for stringified fields before the binary sequence and the fields after
+        // the binary sequence
+        currentLength += (value.position + value.position * 0.3 + 22 + 17) | 0;
+      } else if (v._bsontype === 'Code') {
+        // TODO: Account for scope?
+        currentLength += v.code.length + 10 + 12 + 3;
+      } else if (v._bsontype === 'Decimal128') {
+        // TODO: Is this worth doing here?
+        currentLength += value.toExtendedJSON().length;
+      } else if (v._bsontype === 'Double') {
+        if ('value' in v && typeof v.value === 'number') currentLength += String(v.value).length;
+      } else if (v._bsontype === 'Int32') {
+        if ('value' in v && typeof v.value === 'number') currentLength += String(v.value).length;
+      } else if (v._bsontype === 'Long') {
+        if ('toString' in v && typeof v.toString === 'function') {
+          currentLength += v.toString().length;
+        }
+      } else if (v._bsontype === 'MaxKey' || v._bsontype === 'MinKey') {
         currentLength += 13;
-      } else if (value._bsontype === 'ObjectId') {
+      } else if (v._bsontype === 'ObjectId') {
         currentLength += 35;
-      } else if (value._bsontype === 'BSONRegExp') {
-      } else if (value._bsontype === 'BSONSymbol') {
-      } else if (value._bsontype === 'Timestamp') {
-      } else if (value._bsontype === 'DBRef') {
+      } else if (
+        v._bsontype === 'BSONRegExp' &&
+        'pattern' in v &&
+        typeof v.pattern === 'string' &&
+        'options' in v &&
+        typeof v.options === 'string'
+      ) {
+        currentLength += 34 + v.pattern.length + 14 + v.options.length;
+      } else if (v._bsontype === 'BSONSymbol' && 'value' in v && v.value === 'string') {
+        currentLength += 12 + v.value.length + 2;
+      } else if (
+        v._bsontype === 'Timestamp' &&
+        't' in v &&
+        typeof v.t === 'string' &&
+        'i' in v &&
+        typeof v.i === 'string'
+      ) {
+        currentLength += 19 + String(v.t).length + 5 + String(v.i).length + 2;
+      } else if (v._bsontype === 'DBRef') {
+        // account for $ref
+        currentLength += 9;
+        // account for collection
+        if ('collection' in v) {
+          currentLength += v.collection.length + 1;
+        }
+
+        // account for db if present
+        if ('db' in v) {
+          currentLength += 8 + v.db?.length + 2;
+        }
+
+        // account for oid if present
+        if ('oid' in v) {
+          currentLength += 35;
+        }
       } else {
       }
     }