@overdeck/desktop 0.49.2 → 0.50.1

package/server/node_modules/msgpackr/dist/test.js

@@ -484,11 +484,7 @@
 				default: // negative int
 					if (token >= 0xe0)
 						return token - 0x100;
-					if (token === undefined) {
-						let error = new Error('Unexpected end of MessagePack data');
-						error.incomplete = true;
-						throw error;
-					}
+					if (token === undefined) throw endOfMessagePackError();
 					throw new Error('Unknown MessagePack token ' + token);
 
 			}
@@ -684,7 +680,16 @@
 		return result;
 	}
 
+	function endOfMessagePackError() {
+		let error = new Error('Unexpected end of MessagePack data');
+		error.incomplete = true;
+		return error;
+	}
+
 	function readArray(length) {
+		// every element occupies at least one byte, so a length beyond what remains in the source can never
+		// be satisfied; check before allocating so a small header can not force a large allocation
+		if (length > srcEnd - position$1) throw endOfMessagePackError();
 		let array = new Array(length);
 		for (let i = 0; i < length; i++) {
 			array[i] = read();
@@ -695,6 +700,7 @@
 	}
 
 	function readMap(length) {
+		if (length > (srcEnd - position$1) / 2) throw endOfMessagePackError(); // each entry needs at least two bytes
 		if (currentUnpackr.mapsAsObjects) {
 			let object = {};
 			for (let i = 0; i < length; i++) {
@@ -1367,7 +1373,7 @@
 						if (value.constructor === Object) writeStruct(value); // simple object
 						else if (value.constructor !== Map && !Array.isArray(value) && !extensionClasses.some(extClass => value instanceof extClass)) {
 							// allow user classes, if they don't need special handling (but do use toJSON if available)
-							writeStruct(value.toJSON ? value.toJSON() : value);
+							writeStruct(packr.useToJSON !== false && value.toJSON ? value.toJSON() : value);
 						} else pack(value);
 					} else
 						pack(value);
@@ -1755,7 +1761,7 @@
 								packArray(value);
 							} else {
 								// use this as an alternate mechanism for expressing how to serialize
-								if (value.toJSON) {
+								if (packr.useToJSON !== false && value.toJSON) {
 									const json = value.toJSON();
 									// if for some reason value.toJSON returns itself it'll loop forever
 									if (json !== value)
@@ -3699,6 +3705,56 @@
 			const deserialized = unpack(serialized);
 			assert.deepStrictEqual(deserialized, { someData: [1, 2, 3, 4] });
 		});
+		test('useToJSON: false encodes own properties instead of the toJSON form', () => {
+			class Record {
+				constructor() {
+					this.id = 1;
+					this.stored = 'own property';
+				}
+				// A response shape, not the durable shape: the API adds a derived field.
+				toJSON() {
+					return { id: this.id, stored: this.stored, derived: 'response only' };
+				}
+			}
+			assert.deepStrictEqual(unpack(pack(new Record)), { id: 1, stored: 'own property', derived: 'response only' });
+
+			const honoring = new Packr({ useToJSON: true });
+			assert.deepStrictEqual(honoring.unpack(honoring.pack(new Record)), {
+				id: 1,
+				stored: 'own property',
+				derived: 'response only',
+			});
+
+			const ignoring = new Packr({ useToJSON: false });
+			assert.deepStrictEqual(ignoring.unpack(ignoring.pack(new Record)), { id: 1, stored: 'own property' });
+		});
+
+		test('useToJSON: false is honored for a class whose toJSON returns this', () => {
+			class Serializable {
+				constructor() {
+					this.someData = [1, 2, 3, 4];
+				}
+				toJSON() {
+					return this;
+				}
+			}
+			const ignoring = new Packr({ useToJSON: false });
+			assert.deepStrictEqual(ignoring.unpack(ignoring.pack(new Serializable)), { someData: [1, 2, 3, 4] });
+		});
+
+		test('useToJSON: false leaves an inherited toJSON alone', () => {
+			class Base {
+				toJSON() {
+					return { fromPrototype: true };
+				}
+			}
+			const record = new Base();
+			record.stored = 'own';
+			const ignoring = new Packr({ useToJSON: false });
+			assert.deepStrictEqual(ignoring.unpack(ignoring.pack(record)), { stored: 'own' });
+			assert.deepStrictEqual(unpack(pack(record)), { fromPrototype: true });
+		});
+
 		test('skip values', function () {
 			var data = {
 				data: [