msgpackr 1.4.6 → 1.5.2

package/dist/node.cjs

@@ -20,6 +20,7 @@ var currentStructures;
 var srcString;
 var srcStringStart = 0;
 var srcStringEnd = 0;
+var bundledStrings;
 var referenceMap;
 var currentExtensions = [];
 var dataView;
@@ -60,12 +61,21 @@ class Unpackr {
 		srcStringEnd = 0;
 		srcString = null;
 		strings = EMPTY_ARRAY;
+		bundledStrings = null;
 		src = source;
 		// this provides cached access to the data view for a buffer if it is getting reused, which is a recommend
 		// technique for getting data from a database where it can be copied into an existing buffer instead of creating
 		// new ones
-		dataView = source.dataView || (source.dataView = new DataView(source.buffer, source.byteOffset, source.byteLength));
-		if (this) {
+		try {
+			dataView = source.dataView || (source.dataView = new DataView(source.buffer, source.byteOffset, source.byteLength));
+		} catch(error) {
+			// if it doesn't have a buffer, maybe it is the wrong type of object
+			src = null;
+			if (source instanceof Uint8Array)
+				throw error
+			throw new Error('Source must be a Uint8Array or Buffer but was a ' + ((source && typeof source == 'object') ? source.constructor.name : typeof source))
+		}
+		if (this instanceof Unpackr) {
 			currentUnpackr = this;
 			if (this.structures) {
 				currentStructures = this.structures;
@@ -242,7 +252,15 @@ function read() {
 		let value;
 		switch (token) {
 			case 0xc0: return null
-			case 0xc1: return C1; // "never-used", return special object to denote that
+			case 0xc1:
+				if (bundledStrings) {
+					value = read(); // followed by the length of the string in characters (not bytes!)
+					if (value > 0)
+						return bundledStrings[1].slice(bundledStrings.position1, bundledStrings.position1 += value)
+					else
+						return bundledStrings[0].slice(bundledStrings.position0, bundledStrings.position0 -= value)
+				}
+				return C1; // "never-used", return special object to denote that
 			case 0xc2: return false
 			case 0xc3: return true
 			case 0xc4:
@@ -297,10 +315,11 @@ function read() {
 				position += 4;
 				return value
 			case 0xcf:
-				if (currentUnpackr.uint64AsNumber)
-					return src[position++] * 0x100000000000000 + src[position++] * 0x1000000000000 + src[position++] * 0x10000000000 + src[position++] * 0x100000000 +
-						src[position++] * 0x1000000 + (src[position++] << 16) + (src[position++] << 8) + src[position++]
-				value = dataView.getBigUint64(position);
+				if (currentUnpackr.int64AsNumber) {
+					value = dataView.getUint32(position) * 0x100000000;
+					value += dataView.getUint32(position + 4);
+				} else
+					value = dataView.getBigUint64(position);
 				position += 8;
 				return value
 
@@ -316,7 +335,11 @@ function read() {
 				position += 4;
 				return value
 			case 0xd3:
-				value = dataView.getBigInt64(position);
+				if (currentUnpackr.int64AsNumber) {
+					value = dataView.getInt32(position) * 0x100000000;
+					value += dataView.getUint32(position + 4);
+				} else
+					value = dataView.getBigInt64(position);
 				position += 8;
 				return value
 
@@ -465,8 +488,10 @@ var readFixedString = readStringJS;
 var readString8 = readStringJS;
 var readString16 = readStringJS;
 var readString32 = readStringJS;
+exports.isNativeAccelerationEnabled = false;
 
 function setExtractor(extractStrings) {
+	exports.isNativeAccelerationEnabled = true;
 	readFixedString = readString(1);
 	readString8 = readString(2);
 	readString16 = readString(3);
@@ -885,6 +910,22 @@ currentExtensions[0x78] = () => {
 	return new RegExp(data[0], data[1])
 };
 
+currentExtensions[0x62] = (data) => {
+	let dataSize = (data[0] << 24) + (data[1] << 16) + (data[2] << 8) + data[3];
+	let dataPosition = position;
+	position += dataSize - 4;
+	bundledStrings = [read(), read()];
+	bundledStrings.position0 = 0;
+	bundledStrings.position1 = 0;
+	let postBundlePosition = position;
+	position = dataPosition;
+	try {
+		return read()
+	} finally {
+		position = postBundlePosition;
+	}
+};
+
 currentExtensions[0xff] = (data) => {
 	// 32-bit date extension
 	if (data.length == 4)
@@ -898,7 +939,7 @@ currentExtensions[0xff] = (data) => {
 			((data[0] << 24) + (data[1] << 16) + (data[2] << 8) + data[3]) / 1000000 +
 			(((data[4] & 0x80) ? -0x1000000000000 : 0) + data[6] * 0x10000000000 + data[7] * 0x100000000 + data[8] * 0x1000000 + (data[9] << 16) + (data[10] << 8) + data[11]) * 1000)
 	else
-		throw new Error('Invalid timestamp length')
+		return new Date('invalid')
 }; // notepack defines extension 0 to mean undefined, so use that as the default here
 // registration of bulk record definition?
 // currentExtensions[0x52] = () =>
@@ -912,6 +953,7 @@ function saveState(callback) {
 	let savedSrcString = srcString;
 	let savedStrings = strings;
 	let savedReferenceMap = referenceMap;
+	let savedBundledStrings = bundledStrings;
 
 	// TODO: We may need to revisit this if we do more external calls to user code (since it could be slow)
 	let savedSrc = new Uint8Array(src.slice(0, srcEnd)); // we copy the data in case it changes while external data is processed
@@ -928,6 +970,7 @@ function saveState(callback) {
 	srcString = savedSrcString;
 	strings = savedStrings;
 	referenceMap = savedReferenceMap;
+	bundledStrings = savedBundledStrings;
 	src = savedSrc;
 	sequentialMode = savedSequentialMode;
 	currentStructures = savedStructures;
@@ -985,6 +1028,8 @@ let target;
 let targetView;
 let position$1 = 0;
 let safeEnd;
+let bundledStrings$1 = null;
+const hasNonLatin = /[\u0080-\uFFFF]/;
 const RECORD_SYMBOL = Symbol('record-id');
 class Packr extends Unpackr {
 	constructor(options) {
@@ -1046,6 +1091,14 @@ class Packr extends Unpackr {
 				position$1 = (position$1 + 7) & 0x7ffffff8; // Word align to make any future copying of this buffer faster
 			start = position$1;
 			referenceMap = packr.structuredClone ? new Map() : null;
+			if (packr.bundleStrings) {
+				bundledStrings$1 = ['', ''];
+				target[position$1++] = 0xd6;
+				target[position$1++] = 0x62; // 'b'
+				bundledStrings$1.position = position$1 - start;
+				position$1 += 4;
+			} else
+				bundledStrings$1 = null;
 			sharedStructures = packr.structures;
 			if (sharedStructures) {
 				if (sharedStructures.uninitialized)
@@ -1084,6 +1137,13 @@ class Packr extends Unpackr {
 			structures = sharedStructures || [];
 			try {
 				pack(value);
+				if (bundledStrings$1) {
+					targetView.setUint32(bundledStrings$1.position + start, position$1 - bundledStrings$1.position - start);
+					let writeStrings = bundledStrings$1;
+					bundledStrings$1 = null;
+					pack(writeStrings[0]);
+					pack(writeStrings[1]);
+				}
 				packr.offset = position$1; // update the offset so next serialization doesn't write over our buffer, but can continue writing to same buffer sequentially
 				if (referenceMap && referenceMap.idsToInsert) {
 					position$1 += referenceMap.idsToInsert.length * 6;
@@ -1094,7 +1154,7 @@ class Packr extends Unpackr {
 					referenceMap = null;
 					return serialized
 				}
-				if (encodeOptions === REUSE_BUFFER_MODE) {
+				if (encodeOptions & REUSE_BUFFER_MODE) {
 					target.start = start;
 					target.end = position$1;
 					return target
@@ -1133,6 +1193,8 @@ class Packr extends Unpackr {
 						return returnBuffer
 					}
 				}
+				if (encodeOptions & RESET_BUFFER_MODE)
+					position$1 = start;
 			}
 		};
 		const pack = (value) => {
@@ -1143,13 +1205,20 @@ class Packr extends Unpackr {
 			var length;
 			if (type === 'string') {
 				let strLength = value.length;
+				if (bundledStrings$1 && strLength >= 8 && strLength < 0x1000) {
+					let twoByte = hasNonLatin.test(value);
+					bundledStrings$1[twoByte ? 0 : 1] += value;
+					target[position$1++] = 0xc1;
+					pack(twoByte ? -strLength : strLength);
+					return
+				}
 				let headerSize;
 				// first we estimate the header size, so we can write to the correct location
 				if (strLength < 0x20) {
 					headerSize = 1;
-				} else if (strLength < 0xff) {
+				} else if (strLength < 0x100) {
 					headerSize = 2;
-				} else if (strLength < 0xff00) {
+				} else if (strLength < 0x10000) {
 					headerSize = 3;
 				} else {
 					headerSize = 5;
@@ -1562,7 +1631,7 @@ class Packr extends Unpackr {
 				if ((end - start) > MAX_BUFFER_SIZE)
 					throw new Error('Packed buffer would be larger than maximum buffer size')
 				newSize = Math.min(MAX_BUFFER_SIZE,
-					Math.round(Math.max((end - start) * (end > 0x4000000 ? 1.25 : 2), 0x1000000) / 0x1000) * 0x1000);
+					Math.round(Math.max((end - start) * (end > 0x4000000 ? 1.25 : 2), 0x400000) / 0x1000) * 0x1000);
 			} else // faster handling for smaller buffers
 				newSize = ((Math.max((end - start) << 2, target.length - 1) >> 12) + 1) << 12;
 			let newBuffer = new ByteArrayAllocate(newSize);
@@ -1587,7 +1656,7 @@ class Packr extends Unpackr {
 
 extensionClasses = [ Date, Set, Error, RegExp, ArrayBuffer, Object.getPrototypeOf(Uint8Array.prototype).constructor /*TypedArray*/, C1Type ];
 extensions = [{
-	pack(date, allocateForWrite) {
+	pack(date, allocateForWrite, pack) {
 		let seconds = date.getTime() / 1000;
 		if ((this.useTimestamp32 || date.getMilliseconds() === 0) && seconds >= 0 && seconds < 0x100000000) {
 			// Timestamp 32
@@ -1602,6 +1671,16 @@ extensions = [{
 			target[position++] = 0xff;
 			targetView.setUint32(position, date.getMilliseconds() * 4000000 + ((seconds / 1000 / 0x100000000) >> 0));
 			targetView.setUint32(position + 4, seconds);
+		} else if (isNaN(seconds)) {
+			if (this.onInvalidDate) {
+				allocateForWrite(0);
+				return pack(this.onInvalidDate())
+			}
+			// Intentionally invalid timestamp
+			let { target, targetView, position} = allocateForWrite(3);
+			target[position++] = 0xd4;
+			target[position++] = 0xff;
+			target[position++] = 0xff;
 		} else {
 			// Timestamp 96
 			let { target, targetView, position} = allocateForWrite(15);
@@ -1787,7 +1866,8 @@ const pack = defaultPackr.pack;
 const encode = defaultPackr.pack;
 const Encoder = Packr;
 const { NEVER, ALWAYS, DECIMAL_ROUND, DECIMAL_FIT } = FLOAT32_OPTIONS;
-const REUSE_BUFFER_MODE = 1000;
+const REUSE_BUFFER_MODE = 512;
+const RESET_BUFFER_MODE = 1024;
 
 class PackrStream extends stream.Transform {
 	constructor(options) {
@@ -1939,9 +2019,7 @@ function tryRequire(moduleId) {
 		let require$1 = module$1.createRequire((typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __filename).href : (document.currentScript && document.currentScript.src || new URL('node.cjs', document.baseURI).href)));
 		return require$1(moduleId)
 	} catch (error) {
-		if (typeof window == 'undefined')
-			console.warn('Native extraction module not loaded, msgpackr will still run, but with decreased performance. ' + error.message.split('\n')[0]);
-		else
+		if (typeof window != 'undefined')
 			console.warn('For browser usage, directly use msgpackr/unpack or msgpackr/pack modules. ' + error.message.split('\n')[0]);
 	}
 }

package/dist/str.cjs

@@ -0,0 +1,100 @@
+let utfz = require('../../msgpack-benchmark/node_modules/utfz-lib')
+
+var safeEnd = 1000000;
+var b = new Uint8Array(32768)
+function writeString(value, target, position) {
+			var length, strLength = value.length;
+			let headerSize;
+			// first we estimate the header size, so we can write to the correct location
+			if (strLength < 0x20) {
+				headerSize = 1;
+			} else if (strLength < 0x100) {
+				headerSize = 2;
+			} else if (strLength < 0x10000) {
+				headerSize = 3;
+			} else {
+				headerSize = 5;
+			}
+			let maxBytes = strLength * 3;
+			//if (position + maxBytes > safeEnd)
+			//	target = makeRoom(position + maxBytes);
+		for (let i = 0; i < 100; i++) {
+			length = pack(value, strLength, target, position + headerSize);
+		}
+			if (strLength < 0x40 || !encodeUtf8) {
+				var strPosition = position + headerSize;
+				var c2 = 0;
+				for (let i = 0; i < strLength; i++) {
+					const c1 = value.charCodeAt(i);
+					if (c1 < 0x80) {
+						target[strPosition++] = c1;
+					} else if (c1 < 0x800) {
+						target[strPosition++] = c1 >> 6 | 0xc0;
+						target[strPosition++] = c1 & 0x3f | 0x80;
+					} else if (
+						(c1 & 0xfc00) === 0xd800 &&
+						((c2 = value.charCodeAt(i + 1)) & 0xfc00) === 0xdc00
+					) {
+						c1 = 0x10000 + ((c1 & 0x03ff) << 10) + (c2 & 0x03ff);
+						i++;
+						target[strPosition++] = c1 >> 18 | 0xf0;
+						target[strPosition++] = c1 >> 12 & 0x3f | 0x80;
+						target[strPosition++] = c1 >> 6 & 0x3f | 0x80;
+						target[strPosition++] = c1 & 0x3f | 0x80;
+					} else {
+						target[strPosition++] = c1 >> 12 | 0xe0;
+						target[strPosition++] = c1 >> 6 & 0x3f | 0x80;
+						target[strPosition++] = c1 & 0x3f | 0x80;
+					}
+				}
+				length = strPosition - position - headerSize;
+			} else {
+				length = encodeUtf8(value, position + headerSize, maxBytes);
+			}
+		
+		
+			if (length < 0x20) {
+				target[position++] = 0xa0 | length;
+			} else if (length < 0x100) {
+				if (headerSize < 2) {
+					target.copyWithin(position + 2, position + 1, position + 1 + length);
+				}
+				target[position++] = 0xd9;
+				target[position++] = length;
+			} else if (length < 0x10000) {
+				if (headerSize < 3) {
+					target.copyWithin(position + 3, position + 2, position + 2 + length);
+				}
+				target[position++] = 0xda;
+				target[position++] = length >> 8;
+				target[position++] = length & 0xff;
+			} else {
+				if (headerSize < 5) {
+					target.copyWithin(position + 5, position + 3, position + 3 + length);
+				}
+				target[position++] = 0xdb;
+				targetView.setUint32(position, length);
+				position += 4;
+			}
+			return position + length
+		};
+const pack = (str, length, buf, offset) => {
+  const start = offset;
+  let currHigh = 0;
+  for (let i = 0; i < length; i++) {
+    const code = str.charCodeAt(i);
+    const high = code >> 8;
+    if (high !== currHigh) {
+      buf[i + offset++] = 0;
+      buf[i + offset++] = high;
+      currHigh = high;
+    }
+    const low = code & 0xff;
+    buf[i + offset] = low;
+    if (!low) {
+      buf[i + ++offset] = currHigh;
+    }
+  }
+  return length + offset - start;
+};
+module.exports = writeString;

package/dist/test.js

@@ -660,6 +660,13 @@
 			assert.deepEqual(deserialized, data);
 		});
 
+		test('255 chars', function() {
+			const data = 'RRZG9A6I7xupPeOZhxcOcioFsuhszGOdyDUcbRf4Zef2kdPIfC9RaLO4jTM5JhuZvTsF09fbRHMGtqk7YAgu3vespeTe9l61ziZ6VrMnYu2CamK96wCkmz0VUXyqaiUoTPgzk414LS9yYrd5uh7w18ksJF5SlC2e91rukWvNqAZJjYN3jpkqHNOFchCwFrhbxq2Lrv1kSJPYCx9blRg2hGmYqTbElLTZHv20iNqwZeQbRMgSBPT6vnbCBPnOh1W';
+			var serialized = pack(data);
+			var deserialized = unpack(serialized);
+			assert.equal(deserialized, data);
+		});
+
 		test('pack/unpack sample data', function(){
 			var data = sampleData;
 			var serialized = pack(data);
@@ -677,6 +684,14 @@
 			var deserialized = packr.unpack(serialized);
 			assert.deepEqual(deserialized, data);
 		});
+		test('pack/unpack sample data with bundled strings', function(){
+			var data = sampleData;
+			let structures = [];
+			let packr = new Packr({ structures, bundleStrings: true });
+			var serialized = packr.pack(data);
+			var deserialized = packr.unpack(serialized);
+			assert.deepEqual(deserialized, data);
+		});
 		if (typeof Buffer != 'undefined')
 		test('replace data', function(){
 			var data1 = {
@@ -982,6 +997,7 @@
 				date: new Date(1532219539733),
 				farFutureDate: new Date(3532219539133),
 				ancient: new Date(-3532219539133),
+				invalidDate: new Date('invalid')
 			};
 			let packr = new Packr();
 			var serialized = packr.pack(data);
@@ -991,6 +1007,7 @@
 			assert.equal(deserialized.date.getTime(), 1532219539733);
 			assert.equal(deserialized.farFutureDate.getTime(), 3532219539133);
 			assert.equal(deserialized.ancient.getTime(), -3532219539133);
+			assert.equal(deserialized.invalidDate.toString(), 'Invalid Date');
 		});
 		test('map/date with options', function(){
 			var map = new Map();
@@ -1001,16 +1018,19 @@
 			var data = {
 				map: map,
 				date: new Date(1532219539011),
+				invalidDate: new Date('invalid')
 			};
 			let packr = new Packr({
 				mapsAsObjects: true,
 				useTimestamp32: true,
+				onInvalidDate: () => 'Custom invalid date'
 			});
 			var serialized = packr.pack(data);
 			var deserialized = packr.unpack(serialized);
 			assert.equal(deserialized.map[4], 'four');
 			assert.equal(deserialized.map.three, 3);
 			assert.equal(deserialized.date.getTime(), 1532219539000);
+			assert.equal(deserialized.invalidDate, 'Custom invalid date');
 		});
 		test('key caching', function() {
 			var data = {
@@ -1064,7 +1084,17 @@
 			var deserialized = packr.unpack(serialized);
 			assert.deepEqual(deserialized, data);
 		});
-
+		test('bigint to float', function() {
+			var data = {
+				a: 325283295382932843n
+			};
+			let packr = new Packr({
+				int64AsNumber: true
+			});
+			var serialized = packr.pack(data);
+			var deserialized = packr.unpack(serialized);
+			assert.deepEqual(deserialized.a, 325283295382932843);
+		});
 		test('numbers', function(){
 			var data = {
 				bigEncodable: 48978578104322,
@@ -1180,7 +1210,7 @@
 			let structures = [];
 			var serialized = pack(data);
 			console.log('MessagePack size', serialized.length);
-			let packr = new Packr({ structures });
+			let packr = new Packr({ structures, bundleStrings: false });
 			var serialized = packr.pack(data);
 			console.log('msgpackr w/ record ext size', serialized.length);
 			for (var i = 0; i < ITERATIONS; i++) {
@@ -1191,7 +1221,7 @@
 			var data = sampleData;
 			this.timeout(10000);
 			let structures = [];
-			let packr = new Packr({ structures });
+			let packr = new Packr({ structures, bundleStrings: false });
 			let buffer = typeof Buffer != 'undefined' ? Buffer.alloc(0x10000) : new Uint8Array(0x10000);
 
 			for (var i = 0; i < ITERATIONS; i++) {

package/index.d.ts

@@ -1,4 +1,4 @@
-export { Unpackr, Decoder, unpack, decode, addExtension, FLOAT32_OPTIONS, clearSource, roundFloat32 } from './unpack'
+export { Unpackr, Decoder, unpack, decode, addExtension, FLOAT32_OPTIONS, clearSource, roundFloat32, isNativeAccelerationEnabled } from './unpack'
 import { Options } from './unpack'
 export { Packr, Encoder, pack, encode } from './pack'
 import { Transform, Readable } from 'stream'

package/index.js

@@ -1,5 +1,5 @@
 export { Packr, Encoder, addExtension, pack, encode, NEVER, ALWAYS, DECIMAL_ROUND, DECIMAL_FIT, REUSE_BUFFER_MODE } from './pack.js'
-export { Unpackr, Decoder, C1, unpack, unpackMultiple, decode, FLOAT32_OPTIONS, clearSource, roundFloat32 } from './unpack.js'
+export { Unpackr, Decoder, C1, unpack, unpackMultiple, decode, FLOAT32_OPTIONS, clearSource, roundFloat32, isNativeAccelerationEnabled } from './unpack.js'
 export { decodeIter, encodeIter } from './iterators.js'
 export const useRecords = false
 export const mapsAsObjects = true

package/node-index.js

@@ -1,5 +1,5 @@
 export { Packr, Encoder, addExtension, pack, encode, NEVER, ALWAYS, DECIMAL_ROUND, DECIMAL_FIT } from './pack.js'
-export { Unpackr, Decoder, C1, unpack, unpackMultiple, decode, FLOAT32_OPTIONS, clearSource, roundFloat32 } from './unpack.js'
+export { Unpackr, Decoder, C1, unpack, unpackMultiple, decode, FLOAT32_OPTIONS, clearSource, roundFloat32, isNativeAccelerationEnabled } from './unpack.js'
 export { PackrStream, UnpackrStream, PackrStream as EncoderStream, UnpackrStream as DecoderStream } from './stream.js'
 export { decodeIter, encodeIter } from './iterators.js'
 export const useRecords = false
@@ -16,9 +16,7 @@ function tryRequire(moduleId) {
 		let require = createRequire(import.meta.url)
 		return require(moduleId)
 	} catch (error) {
-		if (typeof window == 'undefined')
-			console.warn('Native extraction module not loaded, msgpackr will still run, but with decreased performance. ' + error.message.split('\n')[0])
-		else
+		if (typeof window != 'undefined')
 			console.warn('For browser usage, directly use msgpackr/unpack or msgpackr/pack modules. ' + error.message.split('\n')[0])
 	}
 }

package/pack.js

@@ -13,6 +13,8 @@ let target
 let targetView
 let position = 0
 let safeEnd
+let bundledStrings = null
+const hasNonLatin = /[\u0080-\uFFFF]/
 const RECORD_SYMBOL = Symbol('record-id')
 export class Packr extends Unpackr {
 	constructor(options) {
@@ -75,6 +77,14 @@ export class Packr extends Unpackr {
 				position = (position + 7) & 0x7ffffff8 // Word align to make any future copying of this buffer faster
 			start = position
 			referenceMap = packr.structuredClone ? new Map() : null
+			if (packr.bundleStrings) {
+				bundledStrings = ['', '']
+				target[position++] = 0xd6
+				target[position++] = 0x62 // 'b'
+				bundledStrings.position = position - start
+				position += 4
+			} else
+				bundledStrings = null
 			sharedStructures = packr.structures
 			if (sharedStructures) {
 				if (sharedStructures.uninitialized)
@@ -113,6 +123,13 @@ export class Packr extends Unpackr {
 			structures = sharedStructures || []
 			try {
 				pack(value)
+				if (bundledStrings) {
+					targetView.setUint32(bundledStrings.position + start, position - bundledStrings.position - start)
+					let writeStrings = bundledStrings
+					bundledStrings = null
+					pack(writeStrings[0])
+					pack(writeStrings[1])
+				}
 				packr.offset = position // update the offset so next serialization doesn't write over our buffer, but can continue writing to same buffer sequentially
 				if (referenceMap && referenceMap.idsToInsert) {
 					position += referenceMap.idsToInsert.length * 6
@@ -123,7 +140,7 @@ export class Packr extends Unpackr {
 					referenceMap = null
 					return serialized
 				}
-				if (encodeOptions === REUSE_BUFFER_MODE) {
+				if (encodeOptions & REUSE_BUFFER_MODE) {
 					target.start = start
 					target.end = position
 					return target
@@ -162,6 +179,8 @@ export class Packr extends Unpackr {
 						return returnBuffer
 					}
 				}
+				if (encodeOptions & RESET_BUFFER_MODE)
+					position = start
 			}
 		}
 		const pack = (value) => {
@@ -172,13 +191,20 @@ export class Packr extends Unpackr {
 			var length
 			if (type === 'string') {
 				let strLength = value.length
+				if (bundledStrings && strLength >= 8 && strLength < 0x1000) {
+					let twoByte = hasNonLatin.test(value)
+					bundledStrings[twoByte ? 0 : 1] += value
+					target[position++] = 0xc1
+					pack(twoByte ? -strLength : strLength);
+					return
+				}
 				let headerSize
 				// first we estimate the header size, so we can write to the correct location
 				if (strLength < 0x20) {
 					headerSize = 1
-				} else if (strLength < 0xff) {
+				} else if (strLength < 0x100) {
 					headerSize = 2
-				} else if (strLength < 0xff00) {
+				} else if (strLength < 0x10000) {
 					headerSize = 3
 				} else {
 					headerSize = 5
@@ -591,7 +617,7 @@ export class Packr extends Unpackr {
 				if ((end - start) > MAX_BUFFER_SIZE)
 					throw new Error('Packed buffer would be larger than maximum buffer size')
 				newSize = Math.min(MAX_BUFFER_SIZE,
-					Math.round(Math.max((end - start) * (end > 0x4000000 ? 1.25 : 2), 0x1000000) / 0x1000) * 0x1000)
+					Math.round(Math.max((end - start) * (end > 0x4000000 ? 1.25 : 2), 0x400000) / 0x1000) * 0x1000)
 			} else // faster handling for smaller buffers
 				newSize = ((Math.max((end - start) << 2, target.length - 1) >> 12) + 1) << 12
 			let newBuffer = new ByteArrayAllocate(newSize)
@@ -622,7 +648,7 @@ function copyBinary(source, target, targetOffset, offset, endOffset) {
 
 extensionClasses = [ Date, Set, Error, RegExp, ArrayBuffer, Object.getPrototypeOf(Uint8Array.prototype).constructor /*TypedArray*/, C1Type ]
 extensions = [{
-	pack(date, allocateForWrite) {
+	pack(date, allocateForWrite, pack) {
 		let seconds = date.getTime() / 1000
 		if ((this.useTimestamp32 || date.getMilliseconds() === 0) && seconds >= 0 && seconds < 0x100000000) {
 			// Timestamp 32
@@ -637,6 +663,16 @@ extensions = [{
 			target[position++] = 0xff
 			targetView.setUint32(position, date.getMilliseconds() * 4000000 + ((seconds / 1000 / 0x100000000) >> 0))
 			targetView.setUint32(position + 4, seconds)
+		} else if (isNaN(seconds)) {
+			if (this.onInvalidDate) {
+				allocateForWrite(0)
+				return pack(this.onInvalidDate())
+			}
+			// Intentionally invalid timestamp
+			let { target, targetView, position} = allocateForWrite(3)
+			target[position++] = 0xd4
+			target[position++] = 0xff
+			target[position++] = 0xff
 		} else {
 			// Timestamp 96
 			let { target, targetView, position} = allocateForWrite(15)
@@ -824,4 +860,5 @@ export const Encoder = Packr
 export { FLOAT32_OPTIONS } from './unpack.js'
 import { FLOAT32_OPTIONS } from './unpack.js'
 export const { NEVER, ALWAYS, DECIMAL_ROUND, DECIMAL_FIT } = FLOAT32_OPTIONS
-export const REUSE_BUFFER_MODE = 1000
+export const REUSE_BUFFER_MODE = 512
+export const RESET_BUFFER_MODE = 1024

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "msgpackr",
   "author": "Kris Zyp",
-  "version": "1.4.6",
+  "version": "1.5.2",
   "description": "Ultra-fast MessagePack implementation with extensions for records and structured cloning",
   "license": "MIT",
   "types": "./index.d.ts",
@@ -49,6 +49,12 @@
       "default": "./unpack.js"
     }
   },
+  "files": [
+    "/dist",
+    "*.md",
+    "/*.js",
+    "/*.ts"
+  ],
   "optionalDependencies": {
     "msgpackr-extract": "^1.0.14"
   },

package/unpack.d.ts

@@ -13,6 +13,7 @@ export interface Options {
 	mapsAsObjects?: boolean
 	variableMapSize?: boolean
 	copyBuffers?: boolean
+	bundleStrings?: boolean
 	useTimestamp32?: boolean
 	largeBigIntToFloat?: boolean
 	encodeUndefinedAsNil?: boolean
@@ -21,6 +22,7 @@ export interface Options {
 	shouldShareStructure?: (keys: string[]) => boolean
 	getStructures?(): {}[]
 	saveStructures?(structures: {}[]): boolean | void
+	onInvalidDate?: () => any
 }
 interface Extension {
 	Class: Function
@@ -44,3 +46,4 @@ export function addExtension(extension: Extension): void
 export function clearSource(): void
 export function roundFloat32(float32Number: number): number
 export const C1: {}
+export let isNativeAccelerationEnabled: boolean