msgpackr 1.7.0-alpha5 → 1.7.0-beta1

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "msgpackr",
   "author": "Kris Zyp",
-  "version": "1.7.0-alpha5",
+  "version": "1.7.0-beta1",
   "description": "Ultra-fast MessagePack implementation with extensions for records and structured cloning",
   "license": "MIT",
   "types": "./index.d.ts",

package/struct.js

@@ -41,11 +41,13 @@ const ASCII = 3; // the MIBenum from https://www.iana.org/assignments/character-
 const NUMBER = 0;
 const UTF8 = 2;
 const OBJECT_DATA = 1;
+const DATE = 16;
 const TYPE_NAMES = ['num', 'object', 'string', 'ascii'];
+TYPE_NAMES[DATE] = 'date';
 const float32Headers = [false, true, true, false, false, true, true, false];
 let updatedPosition;
 const hasNodeBuffer = typeof Buffer !== 'undefined'
-let textEncoder
+let textEncoder, currentSource;
 try {
 	textEncoder = new TextEncoder()
 } catch (error) {}
@@ -89,7 +91,7 @@ function writeStruct(object, target, position, structures, makeRoom, pack, packr
 		return 0;
 	position += headerSize;
 	let queuedReferences = [];
-	let usedLatin0;
+	let usedAscii0;
 	let keyIndex = 0;
 	for (let key in object) {
 		let value = object[key];
@@ -105,7 +107,8 @@ function writeStruct(object, target, position, structures, makeRoom, pack, packr
 				string16: null,
 				object16: null,
 				num32: null,
-				float64: null
+				float64: null,
+				date64: null
 			};
 		}
 		if (position > safeEnd) {
@@ -198,25 +201,47 @@ function writeStruct(object, target, position, structures, makeRoom, pack, packr
 					refPosition += encodeUtf8(target, value, refPosition);
 					isNotAscii = refPosition - strStart > strLength;
 				}
-				if (refOffset < 0x100) {
-					if (isNotAscii)
-						transition = nextTransition.string8 || createTypeTransition(nextTransition, UTF8, 1);
-					else
-						transition = nextTransition.ascii8 || createTypeTransition(nextTransition, ASCII, 1);
+				if (refOffset < 0xa0 || (refOffset < 0xf6 && (nextTransition.ascii8 || nextTransition.string8))) {
+					// short strings
+					if (isNotAscii) {
+						if (!(transition = nextTransition.string8)) {
+							if (typedStructs.length > 10 && (transition = nextTransition.ascii8)) {
+								// we can safely change ascii to utf8 in place since they are compatible
+								transition.__type = UTF8;
+								nextTransition.ascii8 = null;
+								nextTransition.string8 = transition;
+								pack(null, 0, true); // special call to notify that structures have been updated
+							} else {
+								transition = createTypeTransition(nextTransition, UTF8, 1);
+							}
+						}
+					} else if (refOffset === 0 && !usedAscii0) {
+						usedAscii0 = true;
+						transition = nextTransition.ascii0 || createTypeTransition(nextTransition, ASCII, 0);
+						break; // don't increment position
+					}// else ascii:
+					else if (!(transition = nextTransition.ascii8) && !(typedStructs.length > 10 && (transition = nextTransition.string8)))
+						transition = createTypeTransition(nextTransition, ASCII, 1);
 					target[position++] = refOffset;
 				} else {
-					if (isNotAscii)
+					// TODO: Enable ascii16 at some point, but get the logic right
+					//if (isNotAscii)
 						transition = nextTransition.string16 || createTypeTransition(nextTransition, UTF8, 2);
-					else
-						transition = nextTransition.ascii16 || createTypeTransition(nextTransition, ASCII, 2);
+					//else
+						//transition = nextTransition.ascii16 || createTypeTransition(nextTransition, ASCII, 2);
 					targetView.setUint16(position, refOffset, true);
 					position += 2;
 				}
 				break;
 			case 'object':
 				if (value) {
-					//transition = nextTransition.object16 || createTypeTransition(nextTransition, OBJECT_DATA, 2);
-					queuedReferences.push(key, value, keyIndex);
+					if (value.constructor === Date) {
+						transition = nextTransition.date64 || createTypeTransition(nextTransition, DATE, 8);
+						targetView.setFloat64(position, value.getTime(), true);
+						position += 8;
+					} else {
+						queuedReferences.push(key, value, keyIndex);
+					}
 					break;
 				} else { // null
 					nextTransition = anyType(nextTransition, position, targetView, -10); // match CBOR with this
@@ -306,7 +331,7 @@ function writeStruct(object, target, position, structures, makeRoom, pack, packr
 				targetView.setUint32(position, refOffset, true);
 				position += 4;
 			}
-		} else {
+		} else { // null or undefined
 			transition = nextTransition.object16 || createTypeTransition(nextTransition, OBJECT_DATA, 2);
 			targetView.setInt16(position, value === null ? -10 : -9, true);
 			position += 2;
@@ -434,7 +459,8 @@ function onLoadedStructures(sharedData) {
 					string16: null,
 					object16: null,
 					num32: null,
-					float64: null
+					float64: null,
+					date64: null,
 				};
 			}
 			transition = createTypeTransition(nextTransition, type, size);
@@ -446,9 +472,8 @@ function onLoadedStructures(sharedData) {
 	this.lastTypedStructuresLength = typed.length;
 	return named;
 }
-var sourceSymbol = Symbol('source')
+var sourceSymbol = Symbol.for('source')
 function readStruct(src, position, srcEnd, unpackr) {
-//	var stringLength = (src[position++] << 8) | src[position++];
 	let recordId = src[position++] - 0x20;
 	if (recordId >= 24) {
 		switch(recordId) {
@@ -509,13 +534,13 @@ function readStruct(src, position, srcEnd, unpackr) {
 				case 0: getRef = () => 0; break;
 				case 1:
 					getRef = (source, position) => {
-						let ref = source.src[position + property.offset];
+						let ref = source.bytes[position + property.offset];
 						return ref >= 0xf6 ? toConstant(ref) : ref;
 					};
 					break;
 				case 2:
 					getRef = (source, position) => {
-						let src = source.src;
+						let src = source.bytes;
 						let dataView = src.dataView || (src.dataView = new DataView(src.buffer, src.byteOffset, src.byteLength));
 						let ref = dataView.getUint16(position + property.offset, true);
 						return ref >= 0xff00 ? toConstant(ref & 0xff) : ref;
@@ -523,7 +548,7 @@ function readStruct(src, position, srcEnd, unpackr) {
 					break;
 				case 4:
 					getRef = (source, position) => {
-						let src = source.src;
+						let src = source.bytes;
 						let dataView = src.dataView || (src.dataView = new DataView(src.buffer, src.byteOffset, src.byteLength));
 						let ref = dataView.getUint32(position + property.offset, true);
 						return ref >= 0xffffff00 ? toConstant(ref & 0xff) : ref;
@@ -541,7 +566,7 @@ function readStruct(src, position, srcEnd, unpackr) {
 					property.multiGetCount = 0;
 					get = function() {
 						let source = this[sourceSymbol];
-						let src = source.src;
+						let src = source.bytes;
 						let position = source.position;
 						let refStart = currentOffset + position;
 						let ref = getRef(source, position);
@@ -557,7 +582,7 @@ function readStruct(src, position, srcEnd, unpackr) {
 							next = next.next;
 						}
 						if (end == null)
-							end = source.srcEnd - refStart;
+							end = source.bytesEnd - refStart;
 						if (source.srcString) {
 							return source.srcString.slice(ref, end);
 						}
@@ -573,7 +598,7 @@ function readStruct(src, position, srcEnd, unpackr) {
 									asciiEnd = null;
 							} while((next = next.next));
 							if (asciiEnd == null)
-								asciiEnd = source.srcEnd - refStart
+								asciiEnd = source.bytesEnd - refStart
 							source.srcString = src.toString('latin1', refStart, refStart + asciiEnd);
 							return source.srcString.slice(ref, end);
 						}
@@ -597,7 +622,7 @@ function readStruct(src, position, srcEnd, unpackr) {
 						let refStart = currentOffset + position;
 						let ref = getRef(source, position);
 						if (typeof ref !== 'number') return ref;
-						let src = source.src;
+						let src = source.bytes;
 						let end, next = property.next;
 						while(next) {
 							end = next.getRef(source, position);
@@ -608,11 +633,16 @@ function readStruct(src, position, srcEnd, unpackr) {
 							next = next.next;
 						}
 						if (end == null)
-							end = source.srcEnd - refStart;
+							end = source.bytesEnd - refStart;
 						if (type === UTF8) {
 							return src.toString('utf8', ref + refStart, end + refStart);
 						} else {
-							return unpackr.unpack(src, { start: ref + refStart, end: end  + refStart }); // could reuse this object
+							currentSource = source;
+							try {
+								return unpackr.unpack(src, { start: ref + refStart, end: end + refStart });
+							} finally {
+								currentSource = null;
+							}
 						}
 					};
 					break;
@@ -621,7 +651,7 @@ function readStruct(src, position, srcEnd, unpackr) {
 						case 4:
 							get = function () {
 								let source = this[sourceSymbol];
-								let src = source.src;
+								let src = source.bytes;
 								let dataView = src.dataView || (src.dataView = new DataView(src.buffer, src.byteOffset, src.byteLength));
 								let position = source.position + property.offset;
 								let value = dataView.getInt32(position, true)
@@ -640,7 +670,7 @@ function readStruct(src, position, srcEnd, unpackr) {
 						case 8:
 							get = function () {
 								let source = this[sourceSymbol];
-								let src = source.src;
+								let src = source.bytes;
 								let dataView = src.dataView || (src.dataView = new DataView(src.buffer, src.byteOffset, src.byteLength));
 								let value = dataView.getFloat64(source.position + property.offset, true);
 								if (isNaN(value)) {
@@ -654,12 +684,22 @@ function readStruct(src, position, srcEnd, unpackr) {
 						case 1:
 							get = function () {
 								let source = this[sourceSymbol];
-								let src = source.src;
+								let src = source.bytes;
 								let value = src[source.position + property.offset];
 								return value < 0xf6 ? value : toConstant(value);
 							};
 							break;
 					}
+					break;
+				case DATE:
+					get = function () {
+						let source = this[sourceSymbol];
+						let src = source.bytes;
+						let dataView = src.dataView || (src.dataView = new DataView(src.buffer, src.byteOffset, src.byteLength));
+						return new Date(dataView.getFloat64(source.position + property.offset, true));
+					};
+					break;
+
 			}
 			property.get = get;
 		}
@@ -668,10 +708,10 @@ function readStruct(src, position, srcEnd, unpackr) {
 	}
 	var instance = new construct();
 	instance[sourceSymbol] = {
-		src,
+		bytes: src,
 		position,
 		srcString: '',
-		srcEnd
+		bytesEnd: srcEnd
 	}
 	return instance;
 }
@@ -684,6 +724,14 @@ function toConstant(code) {
 	}
 	throw new Error('Unknown constant');
 }
+
+function saveState() {
+	if (currentSource) {
+		currentSource.bytes = Uint8Array.prototype.slice.call(currentSource.bytes, currentSource.position, currentSource.bytesEnd);
+		currentSource.position = 0;
+		currentSource.bytesEnd = currentSource.bytes.length;
+	}
+}
 function prepareStructures(structures, packr) {
 	if (packr.typedStructs) {
 		let structMap = new Map();
@@ -713,5 +761,5 @@ function prepareStructures(structures, packr) {
 	return structures;
 }
 
-setReadStruct(readStruct, onLoadedStructures);
+setReadStruct(readStruct, onLoadedStructures, saveState);
 

package/unpack.js

@@ -28,7 +28,7 @@ export const C1 = new C1Type()
 C1.name = 'MessagePack 0xC1'
 var sequentialMode = false
 var inlineObjectReadThreshold = 2
-var readStruct, onLoadedStructures
+var readStruct, onLoadedStructures, onSaveState
 try {
 	new Function('')
 } catch(error) {
@@ -208,7 +208,7 @@ export function checkedRead(options) {
 		// else more to read, but we are reading sequentially, so don't clear source yet
 		return result
 	} catch(error) {
-		if (currentStructures.restoreStructures)
+		if (currentStructures?.restoreStructures)
 			restoreStructures()
 		clearSource()
 		if (error instanceof RangeError || error.message.startsWith('Unexpected end of buffer') || position > srcEnd) {
@@ -930,7 +930,16 @@ function readKey() {
 
 // the registration of the record definition extension (as "r")
 const recordDefinition = (id, highByte) => {
-	var structure = read()
+	let structure
+	if (currentUnpackr.freezeData) {
+		currentUnpackr.freezeData = false;
+		try {
+			structure = read()
+		} finally {
+			currentUnpackr.freezeData = true;
+		}
+	} else
+		structure = read()
 	let firstByte = id
 	if (highByte !== undefined) {
 		id = id < 32 ? -((highByte << 5) + id) : ((highByte << 5) + id)
@@ -1032,6 +1041,8 @@ currentExtensions[0xff] = (data) => {
 // currentExtensions[0x52] = () =>
 
 function saveState(callback) {
+	if (onSaveState)
+		onSaveState();
 	let savedSrcEnd = srcEnd
 	let savedPosition = position
 	let savedStringPosition = stringPosition
@@ -1101,7 +1112,8 @@ export function roundFloat32(float32Number) {
 	let multiplier = mult10[((u8Array[3] & 0x7f) << 1) | (u8Array[2] >> 7)]
 	return ((multiplier * float32Number + (float32Number > 0 ? 0.5 : -0.5)) >> 0) / multiplier
 }
-export function setReadStruct(updatedReadStruct, loadedStructs) {
+export function setReadStruct(updatedReadStruct, loadedStructs, saveState) {
 	readStruct = updatedReadStruct;
 	onLoadedStructures = loadedStructs;
+	onSaveState = saveState;
 }