bson 0.2.1 → 0.2.2

package/browser_build/bson.js

@@ -1965,6 +1965,7 @@ var crc32 =  function(string, start, end) {
  *  - **evalFunctions** {Boolean, default:false}, evaluate functions in the BSON document scoped to the object deserialized.
  *  - **cacheFunctions** {Boolean, default:false}, cache evaluated functions for reuse.
  *  - **cacheFunctionsCrc32** {Boolean, default:false}, use a crc32 code for caching, otherwise use the string of the function.
+ *  - **promoteLongs** {Boolean, default:true}, when deserializing a Long will fit it into a Number if it's smaller than 53 bits
  *
  * @param {Buffer} data the buffer containing the serialized set of BSON documents.
  * @param {Number} startIndex the start index in the data Buffer where the deserialization is to start.
@@ -2054,6 +2055,7 @@ var convertArraytoUtf8BinaryString = function(byteArray, startIndex, endIndex) {
  *  - **evalFunctions** {Boolean, default:false}, evaluate functions in the BSON document scoped to the object deserialized.
  *  - **cacheFunctions** {Boolean, default:false}, cache evaluated functions for reuse.
  *  - **cacheFunctionsCrc32** {Boolean, default:false}, use a crc32 code for caching, otherwise use the string of the function.
+ *  - **promoteLongs** {Boolean, default:true}, when deserializing a Long will fit it into a Number if it's smaller than 53 bits
  *
  * @param {Buffer} buffer the buffer containing the serialized set of BSON documents.
  * @param {Object} [options] additional options used for the deserialization.
@@ -2067,6 +2069,7 @@ BSON.deserialize = function(buffer, options, isArray) {
   var evalFunctions = options['evalFunctions'] == null ? false : options['evalFunctions'];
   var cacheFunctions = options['cacheFunctions'] == null ? false : options['cacheFunctions'];
   var cacheFunctionsCrc32 = options['cacheFunctionsCrc32'] == null ? false : options['cacheFunctionsCrc32'];
+  var promoteLongs = options['promoteLongs'] || true;
 
   // Validate that we have at least 4 bytes of buffer
   if(buffer.length < 5) throw new Error("corrupt bson message < 5 bytes long");
@@ -2221,8 +2224,14 @@ BSON.deserialize = function(buffer, options, isArray) {
         // Unpack the low and high bits
         var lowBits = buffer[index++] | buffer[index++] << 8 | buffer[index++] << 16 | buffer[index++] << 24;
         var highBits = buffer[index++] | buffer[index++] << 8 | buffer[index++] << 16 | buffer[index++] << 24;
-        // Set the object
-        object[name] = new Long(lowBits, highBits);
+        // Create long object
+        var long = new Long(lowBits, highBits); 
+        // Promote the long if possible
+        if(promoteLongs) {
+          object[name] = long.lessThanOrEqual(JS_INT_MAX_LONG) && long.greaterThanOrEqual(JS_INT_MIN_LONG) ? long.toNumber() : long;
+        } else {
+          object[name] = long;
+        }
         break;
       case BSON.BSON_DATA_SYMBOL:
         // Read the content of the field

package/build/Release/obj/bson/bson.lastbuildstate

@@ -1,2 +1,2 @@
-#v4.0:v100
-Release|Win32|Z:\coding\projects\js-bson\build\|
+#v4.0:Windows7.1SDK
+Release|x64|Z:\coding\projects\js-bson\build\|

package/build/binding.sln

@@ -4,14 +4,14 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bson", "bson.vcxproj", "{C4
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Release|Win32 = Release|Win32
+		Debug|x64 = Debug|x64
+		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{C480D2C0-7E29-C7A7-FD22-F87AD7E5A4C6}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C480D2C0-7E29-C7A7-FD22-F87AD7E5A4C6}.Debug|Win32.Build.0 = Debug|Win32
-		{C480D2C0-7E29-C7A7-FD22-F87AD7E5A4C6}.Release|Win32.ActiveCfg = Release|Win32
-		{C480D2C0-7E29-C7A7-FD22-F87AD7E5A4C6}.Release|Win32.Build.0 = Release|Win32
+		{C480D2C0-7E29-C7A7-FD22-F87AD7E5A4C6}.Debug|x64.ActiveCfg = Debug|x64
+		{C480D2C0-7E29-C7A7-FD22-F87AD7E5A4C6}.Debug|x64.Build.0 = Debug|x64
+		{C480D2C0-7E29-C7A7-FD22-F87AD7E5A4C6}.Release|x64.ActiveCfg = Release|x64
+		{C480D2C0-7E29-C7A7-FD22-F87AD7E5A4C6}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

package/build/bson.vcxproj

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
+    <ProjectConfiguration Include="Debug|x64">
       <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
+      <Platform>x64</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
+    <ProjectConfiguration Include="Release|x64">
       <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
+      <Platform>x64</Platform>
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
@@ -19,6 +19,9 @@
   <PropertyGroup Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
   </PropertyGroup>
+  <PropertyGroup Label="Locals">
+    <PlatformToolset>Windows7.1SDK</PlatformToolset>
+  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props"/>
   <ImportGroup Label="ExtensionSettings"/>
   <ImportGroup Label="PropertySheets">
@@ -29,14 +32,14 @@
     <ExecutablePath>$(ExecutablePath);$(MSBuildProjectDirectory)\..\bin\;$(MSBuildProjectDirectory)\..\bin\</ExecutablePath>
     <IgnoreImportLibrary>true</IgnoreImportLibrary>
     <IntDir>$(Configuration)\obj\$(ProjectName)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
     <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
     <TargetExt>.node</TargetExt>
     <TargetName>$(ProjectName)</TargetName>
     <TargetPath>$(OutDir)\$(ProjectName).node</TargetPath>
   </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <AdditionalIncludeDirectories>C:\Users\ck\.node-gyp\0.10.13\src;C:\Users\ck\.node-gyp\0.10.13\deps\uv\include;C:\Users\ck\.node-gyp\0.10.13\deps\v8\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -62,13 +65,14 @@
       <OutputFile>$(OutDir)$(ProjectName).node</OutputFile>
       <RandomizedBaseAddress>true</RandomizedBaseAddress>
       <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetMachine>MachineX64</TargetMachine>
     </Link>
     <ResourceCompile>
       <AdditionalIncludeDirectories>C:\Users\ck\.node-gyp\0.10.13\src;C:\Users\ck\.node-gyp\0.10.13\deps\uv\include;C:\Users\ck\.node-gyp\0.10.13\deps\v8\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;BUILDING_V8_SHARED=1;BUILDING_UV_SHARED=1;BUILDING_NODE_EXTENSION;DEBUG;_DEBUG;%(PreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ResourceCompile>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
       <AdditionalIncludeDirectories>C:\Users\ck\.node-gyp\0.10.13\src;C:\Users\ck\.node-gyp\0.10.13\deps\uv\include;C:\Users\ck\.node-gyp\0.10.13\deps\v8\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
@@ -105,6 +109,7 @@
       <OutputFile>$(OutDir)$(ProjectName).node</OutputFile>
       <RandomizedBaseAddress>true</RandomizedBaseAddress>
       <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetMachine>MachineX64</TargetMachine>
     </Link>
     <ResourceCompile>
       <AdditionalIncludeDirectories>C:\Users\ck\.node-gyp\0.10.13\src;C:\Users\ck\.node-gyp\0.10.13\deps\uv\include;C:\Users\ck\.node-gyp\0.10.13\deps\v8\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

package/build/config.gypi

@@ -5,7 +5,8 @@
     "default_configuration": "Release",
     "defines": [],
     "include_dirs": [],
-    "libraries": []
+    "libraries": [],
+    "msbuild_toolset": "Windows7.1SDK"
   },
   "variables": {
     "clang": 0,
@@ -26,7 +27,7 @@
     "node_use_perfctr": "true",
     "node_use_systemtap": "false",
     "python": "C:\\Python27\\python.exe",
-    "target_arch": "ia32",
+    "target_arch": "x64",
     "v8_enable_gdbjit": 0,
     "v8_no_strict_aliasing": 1,
     "v8_use_snapshot": "false",

package/ext/bson.cc

@@ -65,10 +65,8 @@ void DataStream::CheckKey(const Local<String>& keyName)
 	size_t keyLength = keyName->Utf8Length();
 	if(keyLength == 0) return;
 
-	// Allocate space for the key
+	// Allocate space for the key, do not need to zero terminate as WriteUtf8 does it
 	char* keyStringBuffer = (char*) alloca(keyLength + 1);
-	// Zero terminate the string
-	keyStringBuffer[keyLength - 1] = 0x00;
 	// Write the key to the allocated buffer
 	keyName->WriteUtf8(keyStringBuffer);
 	// Check for the zero terminator
@@ -408,16 +406,16 @@ Local<String> BSONDeserializer::ReadObjectId()
 	return String::New(objectId, 12);
 }
 
-Handle<Value> BSONDeserializer::DeserializeDocument()
+Handle<Value> BSONDeserializer::DeserializeDocument(bool promoteLongs)
 {
 	uint32_t length = ReadUInt32();
 	if(length < 5) ThrowAllocatedStringException(64, "Bad BSON: Document is less than 5 bytes");
 
 	BSONDeserializer documentDeserializer(*this, length-4);
-	return documentDeserializer.DeserializeDocumentInternal();
+	return documentDeserializer.DeserializeDocumentInternal(promoteLongs);
 }
 
-Handle<Value> BSONDeserializer::DeserializeDocumentInternal()
+Handle<Value> BSONDeserializer::DeserializeDocumentInternal(bool promoteLongs)
 {
 	Local<Object> returnObject = Object::New();
 
@@ -425,7 +423,7 @@ Handle<Value> BSONDeserializer::DeserializeDocumentInternal()
 	{
 		BsonType type = (BsonType) ReadByte();
 		const Local<String>& name = ReadCString();
-		const Handle<Value>& value = DeserializeValue(type);
+		const Handle<Value>& value = DeserializeValue(type, promoteLongs);
 		returnObject->ForceSet(name, value);
 	}
 	if(p != pEnd) ThrowAllocatedStringException(64, "Bad BSON Document: Serialize consumed unexpected number of bytes");
@@ -443,16 +441,16 @@ Handle<Value> BSONDeserializer::DeserializeDocumentInternal()
 	}
 }
 
-Handle<Value> BSONDeserializer::DeserializeArray()
+Handle<Value> BSONDeserializer::DeserializeArray(bool promoteLongs)
 {
 	uint32_t length = ReadUInt32();
 	if(length < 5) ThrowAllocatedStringException(64, "Bad BSON: Array Document is less than 5 bytes");
 
 	BSONDeserializer documentDeserializer(*this, length-4);
-	return documentDeserializer.DeserializeArrayInternal();
+	return documentDeserializer.DeserializeArrayInternal(promoteLongs);
 }
 
-Handle<Value> BSONDeserializer::DeserializeArrayInternal()
+Handle<Value> BSONDeserializer::DeserializeArrayInternal(bool promoteLongs)
 {
 	Local<Array> returnArray = Array::New();
 
@@ -460,7 +458,7 @@ Handle<Value> BSONDeserializer::DeserializeArrayInternal()
 	{
 		BsonType type = (BsonType) ReadByte();
 		uint32_t index = ReadIntegerString();
-		const Handle<Value>& value = DeserializeValue(type);
+		const Handle<Value>& value = DeserializeValue(type, promoteLongs);
 		returnArray->Set(index, value);
 	}
 	if(p != pEnd) ThrowAllocatedStringException(64, "Bad BSON Array: Serialize consumed unexpected number of bytes");
@@ -468,7 +466,7 @@ Handle<Value> BSONDeserializer::DeserializeArrayInternal()
 	return returnArray;
 }
 
-Handle<Value> BSONDeserializer::DeserializeValue(BsonType type)
+Handle<Value> BSONDeserializer::DeserializeValue(BsonType type, bool promoteLongs)
 {
 	switch(type)
 	{
@@ -517,7 +515,7 @@ Handle<Value> BSONDeserializer::DeserializeValue(BsonType type)
 		{
 			ReadUInt32();
 			const Local<Value>& code = ReadString();
-			const Handle<Value>& scope = DeserializeDocument();
+			const Handle<Value>& scope = DeserializeDocument(promoteLongs);
 			Local<Value> argv[] = { code, scope->ToObject() };
 			return bson->codeConstructor->NewInstance(2, argv);
 		}
@@ -549,6 +547,18 @@ Handle<Value> BSONDeserializer::DeserializeValue(BsonType type)
 			int32_t lowBits = (int32_t) ReadInt32();
 			int32_t highBits = (int32_t) ReadInt32();
 
+			// Promote long is enabled
+			if(promoteLongs) {
+				// If value is < 2^53 and >-2^53
+				if((highBits < 0x200000 || (highBits == 0x200000 && lowBits == 0)) && highBits >= -0x200000) {
+					// Adjust the pointer and read as 64 bit value
+					p -= 8;
+					// Read the 64 bit value
+					int64_t finalValue = (int64_t) ReadInt64();
+					return Number::New(finalValue);
+				} 
+			}
+
 			// Decode the Long value
 			Local<Value> argv[] = { Int32::New(lowBits), Int32::New(highBits) };
 			return bson->longConstructor->NewInstance(2, argv);
@@ -558,10 +568,10 @@ Handle<Value> BSONDeserializer::DeserializeValue(BsonType type)
 		return Date::New((double) ReadInt64());
 
 	case BSON_TYPE_ARRAY:
-		return DeserializeArray();
+		return DeserializeArray(promoteLongs);
 
 	case BSON_TYPE_OBJECT:
-		return DeserializeDocument();
+		return DeserializeDocument(promoteLongs);
 
 	case BSON_TYPE_SYMBOL:
 		{
@@ -733,11 +743,21 @@ Handle<Value> BSON::BSONDeserialize(const Arguments &args)
 {
 	HandleScope scope;
 
-	// Ensure that we have an parameter
-	if(Buffer::HasInstance(args[0]) && args.Length() > 1) return VException("One argument required - buffer1.");
-	if(args[0]->IsString() && args.Length() > 1) return VException("One argument required - string1.");
-	// Throw an exception if the argument is not of type Buffer
-	if(!Buffer::HasInstance(args[0]) && !args[0]->IsString()) return VException("Argument must be a Buffer or String.");
+	// Fail if the first argument is not a string or a buffer
+	if(args.Length() > 1 && !args[0]->IsString() && !Buffer::HasInstance(args[0]))
+		return VException("First Argument must be a Buffer or String.");
+
+	// Promote longs
+	bool promoteLongs = true;
+
+	// If we have an options object
+	if(args.Length() == 2 && args[1]->IsObject()) {
+		Local<Object> options = args[1]->ToObject();
+
+		if(options->Has(String::New("promoteLongs"))) {
+			promoteLongs = options->Get(String::New("promoteLongs"))->ToBoolean()->Value();
+		}
+	}	
 
 	// Define pointer to data
 	Local<Object> obj = args[0]->ToObject();
@@ -763,7 +783,8 @@ Handle<Value> BSON::BSONDeserialize(const Arguments &args)
 		try
 		{
 			BSONDeserializer deserializer(bson, data, length);
-			return deserializer.DeserializeDocument();
+			// deserializer.promoteLongs = promoteLongs;
+			return deserializer.DeserializeDocument(promoteLongs);
 		}
 		catch(char* exception)
 		{
@@ -788,7 +809,8 @@ Handle<Value> BSON::BSONDeserialize(const Arguments &args)
 		try
 		{
 			BSONDeserializer deserializer(bson, data, len);
-			Handle<Value> result = deserializer.DeserializeDocument();
+			// deserializer.promoteLongs = promoteLongs;
+			Handle<Value> result = deserializer.DeserializeDocument(promoteLongs);
 			free(data);
 			return result;
 
@@ -966,6 +988,17 @@ Handle<Value> BSON::BSONDeserializeStream(const Arguments &args)
 	uint32_t numberOfDocuments = args[2]->Uint32Value();
 	uint32_t index = args[1]->Uint32Value();
 	uint32_t resultIndex = args[4]->Uint32Value();
+	bool promoteLongs = true;
+
+	// Check for the value promoteLongs in the options object
+	if(args.Length() == 6) {
+		Local<Object> options = args[5]->ToObject();
+
+		// Check if we have the promoteLong variable
+		if(options->Has(String::New("promoteLongs"))) {
+			promoteLongs = options->Get(String::New("promoteLongs"))->ToBoolean()->Value();
+		}
+	}
 
 	// Unpack the BSON parser instance
 	BSON *bson = ObjectWrap::Unwrap<BSON>(args.This());
@@ -988,7 +1021,7 @@ Handle<Value> BSON::BSONDeserializeStream(const Arguments &args)
 	{
 		try
 		{
-			documents->Set(i + resultIndex, deserializer.DeserializeDocument());
+			documents->Set(i + resultIndex, deserializer.DeserializeDocument(promoteLongs));
 		}
 		catch (char* exception)
 		{

package/ext/bson.h

@@ -234,7 +234,7 @@ public:
 	BSONDeserializer(BSON* aBson, char* data, size_t length);
 	BSONDeserializer(BSONDeserializer& parentSerializer, size_t length);
 
-	Handle<Value> DeserializeDocument();
+	Handle<Value> DeserializeDocument(bool promoteLongs);
 
 	bool			HasMoreData() const { return p < pEnd; }
 	Local<String>	ReadCString();
@@ -259,10 +259,10 @@ public:
 	size_t			GetSerializeSize() const { return p - pStart; }
 
 private:
-	Handle<Value> DeserializeArray();
-	Handle<Value> DeserializeValue(BsonType type);
-	Handle<Value> DeserializeDocumentInternal();
-	Handle<Value> DeserializeArrayInternal();
+	Handle<Value> DeserializeArray(bool promoteLongs);
+	Handle<Value> DeserializeValue(BsonType type, bool promoteLongs);
+	Handle<Value> DeserializeDocumentInternal(bool promoteLongs);
+	Handle<Value> DeserializeArrayInternal(bool promoteLongs);
 
 	BSON*		bson;
 	char* const pStart;

package/lib/bson/bson.js

@@ -1053,6 +1053,7 @@ var crc32 =  function(string, start, end) {
  *  - **evalFunctions** {Boolean, default:false}, evaluate functions in the BSON document scoped to the object deserialized.
  *  - **cacheFunctions** {Boolean, default:false}, cache evaluated functions for reuse.
  *  - **cacheFunctionsCrc32** {Boolean, default:false}, use a crc32 code for caching, otherwise use the string of the function.
+ *  - **promoteLongs** {Boolean, default:true}, when deserializing a Long will fit it into a Number if it's smaller than 53 bits
  *
  * @param {Buffer} data the buffer containing the serialized set of BSON documents.
  * @param {Number} startIndex the start index in the data Buffer where the deserialization is to start.
@@ -1142,6 +1143,7 @@ var convertArraytoUtf8BinaryString = function(byteArray, startIndex, endIndex) {
  *  - **evalFunctions** {Boolean, default:false}, evaluate functions in the BSON document scoped to the object deserialized.
  *  - **cacheFunctions** {Boolean, default:false}, cache evaluated functions for reuse.
  *  - **cacheFunctionsCrc32** {Boolean, default:false}, use a crc32 code for caching, otherwise use the string of the function.
+ *  - **promoteLongs** {Boolean, default:true}, when deserializing a Long will fit it into a Number if it's smaller than 53 bits
  *
  * @param {Buffer} buffer the buffer containing the serialized set of BSON documents.
  * @param {Object} [options] additional options used for the deserialization.
@@ -1155,6 +1157,7 @@ BSON.deserialize = function(buffer, options, isArray) {
   var evalFunctions = options['evalFunctions'] == null ? false : options['evalFunctions'];
   var cacheFunctions = options['cacheFunctions'] == null ? false : options['cacheFunctions'];
   var cacheFunctionsCrc32 = options['cacheFunctionsCrc32'] == null ? false : options['cacheFunctionsCrc32'];
+  var promoteLongs = options['promoteLongs'] == null ? true : options['promoteLongs'];
 
   // Validate that we have at least 4 bytes of buffer
   if(buffer.length < 5) throw new Error("corrupt bson message < 5 bytes long");
@@ -1309,8 +1312,14 @@ BSON.deserialize = function(buffer, options, isArray) {
         // Unpack the low and high bits
         var lowBits = buffer[index++] | buffer[index++] << 8 | buffer[index++] << 16 | buffer[index++] << 24;
         var highBits = buffer[index++] | buffer[index++] << 8 | buffer[index++] << 16 | buffer[index++] << 24;
-        // Set the object
-        object[name] = new Long(lowBits, highBits);
+        // Create long object
+        var long = new Long(lowBits, highBits); 
+        // Promote the long if possible
+        if(promoteLongs) {
+          object[name] = long.lessThanOrEqual(JS_INT_MAX_LONG) && long.greaterThanOrEqual(JS_INT_MIN_LONG) ? long.toNumber() : long;
+        } else {
+          object[name] = long;
+        }
         break;
       case BSON.BSON_DATA_SYMBOL:
         // Read the content of the field

package/package.json

@@ -1,7 +1,7 @@
 { "name" :            "bson"
 , "description" :     "A bson parser for node.js and the browser"
 , "keywords" :        ["mongodb", "bson", "parser"]
-, "version" :         "0.2.1"
+, "version" :         "0.2.2"
 , "author" :          "Christian Amor Kvalheim <christkv@gmail.com>"
 , "contributors" :  []