@basmilius/apple-encoding 0.9.17 → 0.9.19

package/dist/index.d.mts

@@ -157,7 +157,7 @@ declare namespace plist_d_exports {
   export { parse, serialize };
 }
 declare namespace tlv8_d_exports {
-  export { ErrorCode, Flags, Method, State, Value, bail, decode, encode };
+  export { ErrorCode, Flags, Method, State, TLV8PairingError, Value, bail, decode, encode };
 }
 declare const Flags: {
   readonly TransientPairing: 0x10;
@@ -205,6 +205,10 @@ declare const Value: {
   readonly Name: 0x11;
   readonly Flags: 0x13;
 };
+declare class TLV8PairingError extends Error {
+  readonly code: number | undefined;
+  constructor(message: string, code?: number);
+}
 declare function bail(data: Map<number, Buffer>): never;
 declare function encode(entries: [number, number | Buffer | Uint8Array][]): Buffer;
 declare function decode(buf: Buffer): Map<number, Buffer>;

package/dist/index.mjs

@@ -398,6 +398,7 @@ function uintToLEBytes(value, byteLen) {
 	return out;
 }
 function readLittleEndian(buf, offset, len) {
+	if (offset + len > buf.length) return 0;
 	if (len === 1) return buf[offset];
 	else if (len === 2) return buf[offset] | buf[offset + 1] << 8;
 	else if (len === 4) return buf[offset] | buf[offset + 1] << 8 | buf[offset + 2] << 16 | buf[offset + 3] << 24 >>> 0;
@@ -670,12 +671,12 @@ function _unpackAt(data, offset, objectList) {
 		let pos = offset + 1;
 		if (count === 15) {
 			const arr = [];
-			while (data[pos] !== TAG.TERMINATOR) {
+			while (pos < data.length && data[pos] !== TAG.TERMINATOR) {
 				const result = _unpackAt(data, pos, objectList);
 				arr.push(result.value);
 				pos = result.offset;
 			}
-			pos++;
+			if (pos < data.length) pos++;
 			value = arr;
 		} else {
 			const arr = new Array(count);
@@ -693,13 +694,13 @@ function _unpackAt(data, offset, objectList) {
 		const obj = {};
 		let pos = offset + 1;
 		if (count === 15) {
-			while (data[pos] !== TAG.TERMINATOR) {
+			while (pos < data.length && data[pos] !== TAG.TERMINATOR) {
 				const keyResult = _unpackAt(data, pos, objectList);
 				const valResult = _unpackAt(data, keyResult.offset, objectList);
 				obj[keyResult.value] = valResult.value;
 				pos = valResult.offset;
 			}
-			pos++;
+			if (pos < data.length) pos++;
 		} else for (let i = 0; i < count; i++) {
 			const keyResult = _unpackAt(data, pos, objectList);
 			const valResult = _unpackAt(data, keyResult.offset, objectList);
@@ -1254,6 +1255,7 @@ var tlv8_exports = /* @__PURE__ */ __exportAll({
 	Flags: () => Flags,
 	Method: () => Method,
 	State: () => State,
+	TLV8PairingError: () => TLV8PairingError,
 	Value: () => Value,
 	bail: () => bail,
 	decode: () => decode,
@@ -1303,18 +1305,26 @@ const Value = {
 	Name: 17,
 	Flags: 19
 };
+var TLV8PairingError = class extends Error {
+	code;
+	constructor(message, code) {
+		super(message);
+		this.name = "TLV8PairingError";
+		this.code = code;
+	}
+};
 function bail(data) {
 	if (data.has(Value.BackOff)) {
 		const buffer = data.get(Value.BackOff);
-		const time = buffer.readUintLE(0, buffer.length);
-		throw new Error(`Device is busy, try again in ${time} seconds.`);
+		throw new TLV8PairingError(`Device is busy, try again in ${buffer.readUintLE(0, buffer.length)} seconds.`, ErrorCode.BackOff);
 	}
 	if (data.has(Value.Error)) {
-		const errorCode = Object.entries(ErrorCode).find(([_, code]) => code === data.get(Value.Error).readUint8());
-		if (!errorCode) throw new Error(`Device returned an unknown error code: ${data.get(Value.Error).readUint8()}`);
-		throw new Error(`Device returned an error code: ${errorCode[0]}`);
+		const code = data.get(Value.Error).readUint8();
+		const errorCode = Object.entries(ErrorCode).find(([_, c]) => c === code);
+		if (!errorCode) throw new TLV8PairingError(`Device returned an unknown error code: ${code}`, code);
+		throw new TLV8PairingError(`Device returned an error code: ${errorCode[0]}`, code);
 	}
-	throw new Error("Invalid response");
+	throw new TLV8PairingError("Invalid response");
 }
 function encode(entries) {
 	let totalSize = 0;

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@basmilius/apple-encoding",
     "description": "Common encoding utilities for Apple Protocols.",
-    "version": "0.9.17",
+    "version": "0.9.19",
     "type": "module",
     "license": "MIT",
     "author": {