cbor-x 1.5.9 → 1.6.3

package/dist/node.cjs

@@ -17,6 +17,10 @@ const RECORD_INLINE_ID = 0xdfff; // temporary first-come first-serve tag // prop
 const BUNDLED_STRINGS_ID = 0xdff9;
 const PACKED_REFERENCE_TAG_ID = 6;
 const STOP_CODE = {};
+let maxArraySize = 112810000; // This is the maximum array size in V8. We would potentially detect and set it higher
+// for JSC, but this is pretty large and should be sufficient for most use cases
+let maxMapSize = 16810000; // JavaScript has a fixed maximum map size of about 16710000, but JS itself enforces this,
+// many keys in an object, so also probably a reasonable choice there.
 let strings = EMPTY_ARRAY;
 let stringPosition = 0;
 let currentDecoder = {};
@@ -265,6 +269,7 @@ function read() {
 				}
 				token = dataView.getUint32(position$1);
 				position$1 += 4;
+				if (majorType === 1) return -1 - token; // can't safely use negation operator here
 				break
 			case 0x1b:
 				if (majorType == 7) {
@@ -279,8 +284,7 @@ function read() {
 				} else if (currentDecoder.int64AsNumber) {
 					token = dataView.getUint32(position$1) * 0x100000000;
 					token += dataView.getUint32(position$1 + 4);
-				} else
-					token = dataView.getBigUint64(position$1);
+				} else token = dataView.getBigUint64(position$1);
 				position$1 += 8;
 				break
 			case 0x1f: 
@@ -293,6 +297,7 @@ function read() {
 						let array = [];
 						let value, i = 0;
 						while ((value = read()) != STOP_CODE) {
+							if (i >= maxArraySize) throw new Error(`Array length exceeds ${maxArraySize}`)
 							array[i++] = value;
 						}
 						return majorType == 4 ? array : majorType == 3 ? array.join('') : Buffer.concat(array)
@@ -300,8 +305,19 @@ function read() {
 						let key;
 						if (currentDecoder.mapsAsObjects) {
 							let object = {};
-							if (currentDecoder.keyMap) while((key = read()) != STOP_CODE) object[safeKey(currentDecoder.decodeKey(key))] = read();
-							else while ((key = read()) != STOP_CODE) object[safeKey(key)] = read();
+							let i = 0;
+							if (currentDecoder.keyMap) {
+								while((key = read()) != STOP_CODE) {
+									if (i++ >= maxMapSize) throw new Error(`Property count exceeds ${maxMapSize}`)
+									object[safeKey(currentDecoder.decodeKey(key))] = read();
+								}
+							}
+							else {
+								while ((key = read()) != STOP_CODE) {
+									if (i++ >= maxMapSize) throw new Error(`Property count exceeds ${maxMapSize}`)
+									object[safeKey(key)] = read();
+								}
+							}
 							return object
 						} else {
 							if (restoreMapsAsObject) {
@@ -309,8 +325,24 @@ function read() {
 								restoreMapsAsObject = false;
 							}
 							let map = new Map();
-							if (currentDecoder.keyMap) while((key = read()) != STOP_CODE) map.set(currentDecoder.decodeKey(key), read());
-							else while ((key = read()) != STOP_CODE) map.set(key, read());
+							if (currentDecoder.keyMap) {
+								let i = 0;
+								while((key = read()) != STOP_CODE) {
+									if (i++ >= maxMapSize) {
+										throw new Error(`Map size exceeds ${maxMapSize}`);
+									}
+									map.set(currentDecoder.decodeKey(key), read());
+								}
+							}
+							else {
+								let i = 0;
+								while ((key = read()) != STOP_CODE) {
+									if (i++ >= maxMapSize) {
+										throw new Error(`Map size exceeds ${maxMapSize}`);
+									}
+									map.set(key, read());
+								}
+							}
 							return map
 						}
 					case 7:
@@ -341,12 +373,14 @@ function read() {
 			}
 			return readFixedString(token)
 		case 4: // array
+			if (token >= maxArraySize) throw new Error(`Array length exceeds ${maxArraySize}`)
 			let array = new Array(token);
 		  //if (currentDecoder.keyMap) for (let i = 0; i < token; i++) array[i] = currentDecoder.decodeKey(read())	
 			//else 
 			for (let i = 0; i < token; i++) array[i] = read();
 			return array
 		case 5: // map
+			if (token >= maxMapSize) throw new Error(`Map size exceeds ${maxArraySize}`)
 			if (currentDecoder.mapsAsObjects) {
 				let object = {};
 				if (currentDecoder.keyMap) for (let i = 0; i < token; i++) object[safeKey(currentDecoder.decodeKey(read()))] = read();
@@ -448,6 +482,7 @@ function read() {
 }
 const validName = /^[a-zA-Z_$][a-zA-Z\d_$]*$/;
 function createStructureReader(structure) {
+	if (!structure) throw new Error('Structure is required in record definition');
 	function readObject() {
 		// get the array size from the header
 		let length = src[position$1++];
@@ -809,7 +844,7 @@ currentExtensions[2] = (buffer) => {
 	// bigint extension
 	let value = BigInt(0);
 	for (let i = 0, l = buffer.byteLength; i < l; i++) {
-		value = BigInt(buffer[i]) + value << BigInt(8);
+		value = BigInt(buffer[i]) + (value << BigInt(8));
 	}
 	return value
 };
@@ -1159,6 +1194,12 @@ function addExtension$1(extension) {
 	currentExtensions[extension.tag] = extension.decode;
 }
 
+function setSizeLimits(limits) {
+	if (limits.maxMapSize) maxMapSize = limits.maxMapSize;
+	if (limits.maxArraySize) maxArraySize = limits.maxArraySize;
+	if (limits.maxObjectSize) limits.maxObjectSize;
+}
+
 const mult10 = new Array(147); // this is a table matching binary exponents to the multiplier to determine significant digit rounding
 for (let i = 0; i < 256; i++) {
 	mult10[i] = +('1e' + Math.floor(45.15 - i * 0.30103));
@@ -1208,8 +1249,8 @@ class Encoder extends Decoder {
 		let structures;
 		let referenceMap;
 		options = options || {};
-		let encodeUtf8 = ByteArray.prototype.utf8Write ? function(string, position, maxBytes) {
-			return target.utf8Write(string, position, maxBytes)
+		let encodeUtf8 = ByteArray.prototype.utf8Write ? function(string, position) {
+			return target.utf8Write(string, position, target.byteLength - position)
 		} : (textEncoder && textEncoder.encodeInto) ?
 			function(string, position) {
 				return textEncoder.encodeInto(string, target.subarray(position)).written
@@ -1590,7 +1631,7 @@ class Encoder extends Decoder {
 						targetView.setUint32(position, value);
 						position += 4;
 					}
-				} else if (!this.alwaysUseFloat && value >> 0 === value) { // negative integer
+				} else if (!this.alwaysUseFloat && value >> 0 === value) { // negative integer, 31-bit or less
 					if (value >= -0x18) {
 						target[position++] = 0x1f - value;
 					} else if (value >= -0x100) {
@@ -1605,6 +1646,11 @@ class Encoder extends Decoder {
 						targetView.setUint32(position, ~value);
 						position += 4;
 					}
+				} else if (!this.alwaysUseFloat && value < 0 && value >= -0x100000000 && Math.floor(value) === value) {
+					// negative integer, 32-bit or less
+					target[position++] = 0x3a;
+					targetView.setUint32(position, -1 - value);
+					position += 4;
 				} else {
 					let useFloat32;
 					if ((useFloat32 = this.useFloat32) > 0 && value < 0x100000000 && value >= -0x80000000) {
@@ -1646,6 +1692,9 @@ class Encoder extends Decoder {
 					}
 					let constructor = value.constructor;
 					if (constructor === Object) {
+						if (this.skipFunction === true) {
+							value = Object.fromEntries([...Object.keys(value).filter(x => typeof value[x] !== "function").map(x => [x, value[x]])]);
+						}
 						writeObject(value);
 					} else if (constructor === Array) {
 						length = value.length;
@@ -1762,7 +1811,19 @@ class Encoder extends Decoder {
 						target[position++] = 0xfb;
 						targetView.setFloat64(position, Number(value));
 					} else {
-						throw new RangeError(value + ' was too large to fit in CBOR 64-bit integer format, set largeBigIntToFloat to convert to float-64')
+						if (value >= BigInt(0))
+							target[position++] = 0xc2; // tag 2
+						else {
+							target[position++] = 0xc3; // tag 2
+							value = BigInt(-1) - value;
+						}
+						let bytes = [];
+						while (value) {
+							bytes.push(Number(value & BigInt(0xff)));
+							value >>= BigInt(8);
+						}
+						writeBuffer(new Uint8Array(bytes.reverse()), makeRoom);
+						return;
 					}
 				}
 				position += 8;
@@ -1809,7 +1870,7 @@ class Encoder extends Decoder {
 			let objectOffset = position - start;
 			position += 2;
 			let size = 0;
-			if (encoder.keyMap) { 
+			if (encoder.keyMap) {
 				for (let key in object) if (typeof object.hasOwnProperty !== 'function' || object.hasOwnProperty(key)) {
 					encode(encoder.encodeKey(key));
 					encode(object[key]);
@@ -1981,7 +2042,7 @@ class Encoder extends Decoder {
 							yield* tryEncode(value, iterateProperties, 'element');
 					} else encode(value);
 				}
-			} else if (object[Symbol.iterator]) {
+			} else if (object[Symbol.iterator] && !object.buffer) { // iterator, but exclude typed arrays
 				target[position++] = 0x9f; // start indefinite array
 				for (let value of object) {
 					if (value && (typeof value === 'object' || position - start > chunkThreshold)) {
@@ -2571,5 +2632,6 @@ exports.encodeAsIterable = encodeAsIterable;
 exports.encodeIter = encodeIter;
 exports.mapsAsObjects = mapsAsObjects;
 exports.roundFloat32 = roundFloat32;
+exports.setSizeLimits = setSizeLimits;
 exports.useRecords = useRecords;
 //# sourceMappingURL=node.cjs.map