cbor-x 1.5.3 → 1.5.5

package/dist/node.cjs

@@ -860,9 +860,18 @@ currentExtensions[27] = (data) => { // http://cbor.schmorp.de/generic-object
 	return (glbl[data[0]] || Error)(data[1], data[2])
 };
 const packedTable = (read) => {
-	if (src[position$1++] != 0x84)
-		throw new Error('Packed values structure must be followed by a 4 element array')
+	if (src[position$1++] != 0x84) {
+		let error = new Error('Packed values structure must be followed by a 4 element array');
+		if (src.length < position$1)
+			error.incomplete = true;
+		throw error
+	}
 	let newPackedValues = read(); // packed values
+	if (!newPackedValues || !newPackedValues.length) {
+		let error = new Error('Packed values structure must be followed by a 4 element array');
+		error.incomplete = true;
+		throw error
+	}
 	packedValues = packedValues ? newPackedValues.concat(packedValues.slice(newPackedValues.length)) : newPackedValues;
 	packedValues.prefixes = read();
 	packedValues.suffixes = read();
@@ -880,7 +889,10 @@ currentExtensions[PACKED_REFERENCE_TAG_ID] = (data) => { // packed reference
 	}
 	if (typeof data == 'number')
 		return packedValues[16 + (data >= 0 ? 2 * data : (-2 * data - 1))]
-	throw new Error('No support for non-integer packed references yet')
+	let error = new Error('No support for non-integer packed references yet');
+	if (data === undefined)
+		error.incomplete = true;
+	throw error
 };
 
 // The following code is an incomplete implementation of http://cbor.schmorp.de/stringref
@@ -1006,7 +1018,15 @@ function registerTypedArray(TypedArray, tag) {
 		currentExtensions[littleEndian ? tag : (tag - 4)] = (bytesPerElement == 1 || littleEndian == isLittleEndianMachine$1) ? (buffer) => {
 			if (!TypedArray)
 				throw new Error('Could not find typed array for code ' + tag)
-			// we have to always slice/copy here to get a new ArrayBuffer that is word/byte aligned
+			if (!currentDecoder.copyBuffers) {
+				// try provide a direct view, but will only work if we are byte-aligned
+				if (bytesPerElement === 1 ||
+					bytesPerElement === 2 && !(buffer.byteOffset & 1) ||
+					bytesPerElement === 4 && !(buffer.byteOffset & 3) ||
+					bytesPerElement === 8 && !(buffer.byteOffset & 7))
+					return new TypedArray(buffer.buffer, buffer.byteOffset, buffer.byteLength);
+			}
+			// we have to slice/copy here to get a new ArrayBuffer, if we are not word/byte aligned
 			return new TypedArray(Uint8Array.prototype.slice.call(buffer, 0).buffer)
 		} : buffer => {
 			if (!TypedArray)
@@ -1696,6 +1716,13 @@ class Encoder extends Decoder {
 							error.iteratorNotHandled = true;
 							throw error;
 						}
+						if (this.useToJSON && value.toJSON) {
+							const json = value.toJSON();
+							// if for some reason value.toJSON returns itself it'll loop forever
+							if (json !== value)
+								return encode(json)
+						}
+
 						// no extension found, write as object
 						writeObject(value, !value.hasOwnProperty); // if it doesn't have hasOwnProperty, don't do hasOwnProperty checks
 					}
@@ -1749,7 +1776,7 @@ class Encoder extends Decoder {
 			}
 			if (encoder.keyMap) { 
 				for (let i = 0; i < length; i++) {
-					encode(encodeKey(keys[i]));
+					encode(encoder.encodeKey(keys[i]));
 					encode(vals[i]);
 				}
 			} else {
@@ -2355,10 +2382,12 @@ class EncoderStream extends stream.Transform {
 		this.encoder = options.encoder || new Encoder(options);
 	}
 	async _transform(value, encoding, callback) {
-		for await (let chunk of this.encoder.encodeAsAsyncIterable(value)) {
-			this.push(chunk);
-		}
-		callback();
+		try {
+			for await (let chunk of this.encoder.encodeAsAsyncIterable(value)) {
+				this.push(chunk);
+			}
+			callback();
+		} catch(error) { callback (error); }
 	}
 }
 
@@ -2379,13 +2408,14 @@ class DecoderStream extends stream.Transform {
 		let values;
 		try {
 			values = this.decoder.decodeMultiple(chunk);
+			callback();
 		} catch(error) {
 			if (error.incomplete) {
 				this.incompleteBuffer = chunk.slice(error.lastPosition);
 				values = error.values;
+			} else {
+				callback(error);
 			}
-			else
-				throw error
 		} finally {
 			for (let value of values || []) {
 				if (value === null)
@@ -2393,7 +2423,6 @@ class DecoderStream extends stream.Transform {
 				this.push(value);
 			}
 		}
-		if (callback) callback();
 	}
 	getNullValue() {
 		return Symbol.for(null)