bson 0.1.8 → 0.2.2

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

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

package/build/Release/obj/bson/bson.node.intermediate.manifest

@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8' standalone='yes'?>
+<assembly xmlns='urn:schemas-microsoft-com:asm.v1' manifestVersion='1.0'>
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
+    <security>
+      <requestedPrivileges>
+        <requestedExecutionLevel level='asInvoker' uiAccess='false' />
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+</assembly>

package/build/Release/obj/bson/bson.write.1.tlog

@@ -0,0 +1,3 @@
+^Z:\coding\projects\js-bson\build\bson.vcxproj
+Z:\coding\projects\js-bson\build\Release\bson.lib
+Z:\coding\projects\js-bson\build\Release\bson.exp

package/build/binding.sln

@@ -0,0 +1,21 @@
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bson", "bson.vcxproj", "{C480D2C0-7E29-C7A7-FD22-F87AD7E5A4C6}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|x64 = Debug|x64
+		Release|x64 = Release|x64
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{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
+	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+	EndGlobalSection
+EndGlobal

package/build/bson.vcxproj

@@ -0,0 +1,127 @@
+<?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|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{C480D2C0-7E29-C7A7-FD22-F87AD7E5A4C6}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>bson</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props"/>
+  <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">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros"/>
+  <PropertyGroup>
+    <ExecutablePath>$(ExecutablePath);$(MSBuildProjectDirectory)\..\bin\;$(MSBuildProjectDirectory)\..\bin\</ExecutablePath>
+    <IgnoreImportLibrary>true</IgnoreImportLibrary>
+    <IntDir>$(Configuration)\obj\$(ProjectName)\</IntDir>
+    <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|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>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <DisableSpecificWarnings>4251;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <ExceptionHandling>Sync</ExceptionHandling>
+      <MinimalRebuild>false</MinimalRebuild>
+      <OmitFramePointers>false</OmitFramePointers>
+      <Optimization>Disabled</Optimization>
+      <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>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <StringPooling>true</StringPooling>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TreatWarningAsError>false</TreatWarningAsError>
+      <WarningLevel>Level3</WarningLevel>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>C:\Users\ck\.node-gyp\0.10.13\$(Configuration)\node.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AllowIsolation>true</AllowIsolation>
+      <DataExecutionPrevention>true</DataExecutionPrevention>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <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|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>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <DisableSpecificWarnings>4251;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <ExceptionHandling>false</ExceptionHandling>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <OmitFramePointers>true</OmitFramePointers>
+      <Optimization>Full</Optimization>
+      <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;BUILDING_V8_SHARED=1;BUILDING_UV_SHARED=1;BUILDING_NODE_EXTENSION;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <RuntimeTypeInfo>false</RuntimeTypeInfo>
+      <StringPooling>true</StringPooling>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TreatWarningAsError>false</TreatWarningAsError>
+      <WarningLevel>Level3</WarningLevel>
+      <WholeProgramOptimization>true</WholeProgramOptimization>
+    </ClCompile>
+    <Lib>
+      <AdditionalOptions>/LTCG %(AdditionalOptions)</AdditionalOptions>
+    </Lib>
+    <Link>
+      <AdditionalDependencies>C:\Users\ck\.node-gyp\0.10.13\$(Configuration)\node.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AllowIsolation>true</AllowIsolation>
+      <DataExecutionPrevention>true</DataExecutionPrevention>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
+      <OptimizeReferences>true</OptimizeReferences>
+      <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;%(PreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ResourceCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <None Include="..\binding.gyp"/>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\ext\bson.cc"/>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/>
+  <ImportGroup Label="ExtensionTargets"/>
+</Project>

package/build/bson.vcxproj.filters

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="..">
+      <UniqueIdentifier>{739DB09A-CC57-A953-A6CF-F64FA08E4FA7}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="..\ext">
+      <UniqueIdentifier>{3EE5B703-384C-67C2-8DE0-73108365DC85}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\binding.gyp">
+      <Filter>..</Filter>
+    </None>
+    <ClCompile Include="..\ext\bson.cc">
+      <Filter>..\ext</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>

package/build/config.gypi

@@ -5,26 +5,35 @@
     "default_configuration": "Release",
     "defines": [],
     "include_dirs": [],
-    "libraries": []
+    "libraries": [],
+    "msbuild_toolset": "Windows7.1SDK"
   },
   "variables": {
-    "clang": 1,
-    "host_arch": "x64",
+    "clang": 0,
+    "host_arch": "ia32",
     "node_install_npm": "true",
-    "node_install_waf": "true",
     "node_prefix": "",
+    "node_shared_cares": "false",
+    "node_shared_http_parser": "false",
+    "node_shared_libuv": "false",
     "node_shared_openssl": "false",
     "node_shared_v8": "false",
     "node_shared_zlib": "false",
     "node_tag": "",
     "node_unsafe_optimizations": 0,
     "node_use_dtrace": "false",
-    "node_use_etw": "false",
+    "node_use_etw": "true",
     "node_use_openssl": "true",
+    "node_use_perfctr": "true",
+    "node_use_systemtap": "false",
+    "python": "C:\\Python27\\python.exe",
     "target_arch": "x64",
+    "v8_enable_gdbjit": 0,
     "v8_no_strict_aliasing": 1,
-    "v8_use_snapshot": "true",
-    "nodedir": "/Users/ck/.node-gyp/0.8.19",
-    "copy_dev_lib": "true"
+    "v8_use_snapshot": "false",
+    "visibility": "",
+    "nodedir": "C:\\Users\\ck\\.node-gyp\\0.10.13",
+    "copy_dev_lib": "true",
+    "standalone_static_library": 1
   }
 }

package/ext/bson.cc

@@ -65,8 +65,17 @@ void DataStream::CheckKey(const Local<String>& keyName)
 	size_t keyLength = keyName->Utf8Length();
 	if(keyLength == 0) return;
 
-	char* keyStringBuffer = (char*) alloca(keyLength+1);
+	// Allocate space for the key, do not need to zero terminate as WriteUtf8 does it
+	char* keyStringBuffer = (char*) alloca(keyLength + 1);
+	// Write the key to the allocated buffer
 	keyName->WriteUtf8(keyStringBuffer);
+	// Check for the zero terminator
+	char* terminator = strchr(keyStringBuffer, 0x00);
+
+	// If the location is not at the end of the string we've got an illegal 0x00 byte somewhere
+	if(terminator != &keyStringBuffer[keyLength]) {
+		ThrowAllocatedStringException(64+keyLength, "key %s must not contain null bytes", keyStringBuffer);
+	}
 
 	if(keyStringBuffer[0] == '$')
 	{
@@ -397,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();
 
@@ -414,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");
@@ -432,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();
 
@@ -449,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");
@@ -457,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)
 	{
@@ -506,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);
 		}
@@ -538,15 +547,19 @@ Handle<Value> BSONDeserializer::DeserializeValue(BsonType type)
 			int32_t lowBits = (int32_t) ReadInt32();
 			int32_t highBits = (int32_t) ReadInt32();
 
-		    // 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);
-		    }
+			// 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);
 		}
@@ -555,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:
 		{
@@ -730,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();
@@ -760,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)
 		{
@@ -785,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;
 
@@ -828,6 +853,9 @@ Handle<Value> BSON::BSONSerialize(const Arguments &args)
 	if(args.Length() == 4 && !args[0]->IsObject() && !args[1]->IsBoolean() && !args[2]->IsBoolean() && !args[3]->IsBoolean()) return VException("One, two or tree arguments required - [object] or [object, boolean] or [object, boolean, boolean] or [object, boolean, boolean, boolean]");
 	if(args.Length() > 4) return VException("One, two, tree or four arguments required - [object] or [object, boolean] or [object, boolean, boolean] or [object, boolean, boolean, boolean]");
 
+	// Check if we have an array as the object
+	if(args[0]->IsArray()) return VException("Only javascript objects supported");
+
 	// Unpack the BSON parser instance
 	BSON *bson = ObjectWrap::Unwrap<BSON>(args.This());
 
@@ -960,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());
@@ -982,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

@@ -5,7 +5,11 @@
 
 //===========================================================================
 
+#ifdef __arm__
+#define USE_MISALIGNED_MEMORY_ACCESS 0
+#else
 #define USE_MISALIGNED_MEMORY_ACCESS 1
+#endif
 
 #include <node.h>
 #include <node_object_wrap.h>
@@ -230,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();
@@ -255,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;