Simplify providing buffer for better performance and determinism

index.js

@@ -2,7 +2,7 @@ exports.Packr = require('./pack').Packr
 let unpackModule = require('./unpack')
 let extractor = tryRequire('./build/Release/msgpackr.node')
 if (extractor)
-	unpackModule.setExtractor(extractor)
+	unpackModule.setExtractor(extractor.extractStrings)
 exports.Unpackr = unpackModule.Unpackr
 exports.PackrStream = require('./stream').PackrStream
 exports.UnpackrStream = require('./stream').UnpackrStream

src/extract.cpp

@@ -63,6 +63,8 @@ NAN_METHOD(extractStrings) {
 	Local<Context> context = Nan::GetCurrentContext();
 	position = Local<Number>::Cast(info[0])->IntegerValue(context).ToChecked();
 	int size = Local<Number>::Cast(info[1])->IntegerValue(context).ToChecked();
+	if (info[2]->IsArrayBufferView())
+		source = (uint8_t*) node::Buffer::Data(info[2]);
 	next_token: while (position < size) {
 		uint8_t token = source[position++];
 		if (token < 0xa0) {
@@ -205,13 +207,8 @@ void setupTokenTable() {
 	});
 }
 
-NAN_METHOD(setSource) {
-	source = (uint8_t*) node::Buffer::Data(info[0]);
-}
-
 void initializeModule(v8::Local<v8::Object> exports) {
 	setupTokenTable();
-	Nan::SetMethod(exports, "setSource", setSource);
 	Nan::SetMethod(exports, "extractStrings", extractStrings);
 }
 

tests/benchmark.js

@@ -15,7 +15,7 @@ msgpack_codec = msgpack_codec && msgpack_codec.msgpack;
 what_the_pack = what_the_pack && what_the_pack.initialize(2**20);
 
 var pkg = require("../package.json");
-var data = require("./example4.json");
+var data = require("./samples/outcomes.json");
 var packed = msgpack_lite.encode(data);
 var expected = JSON.stringify(data);
 

unpack.js

@@ -1,5 +1,4 @@
 "use strict"
-let setSource = () => {} // don't need to do anything without the native support here
 let decoder
 try {
 	decoder = new TextDecoder()
@@ -43,10 +42,10 @@ class Unpackr {
 		srcStringEnd = 0
 		srcString = null
 		strings = EMPTY_ARRAY
-		if (src !== source) {
-			src = source
-			setSource(source)
-		}
+//		if (src !== source) {
+		src = source
+///			setSource(source)
+//		}
 		let value
 		if (this) {
 			currentUnpackr = this
@@ -78,8 +77,7 @@ exports.getPosition = () => {
 	return position
 }
 exports.setExtractor = (extractor) => {
-	setSource = extractor.setSource
-	extractStrings = extractor.extractStrings
+	extractStrings = extractor
 }
 
 function read() {
@@ -297,7 +295,7 @@ function readString(headerLength) {
 	return function readString(length) {
 		let string = strings[stringPosition++]
 		if (string == null) {
-			strings = extractStrings ? extractStrings(position - headerLength, srcEnd) : [decoder.decode(src.slice(position, position + length))]
+			strings = extractStrings ? extractStrings(position - headerLength, srcEnd, src) : [decoder.decode(src.slice(position, position + length))]
 			stringPosition = 0
 			string = strings[stringPosition++]
 		}