wpd-codec 3.5.0 → 3.5.2

package/dist/stream/box.js

@@ -7,83 +7,74 @@ const OVERRIDE_BIT_HTML = 7;
 const OVERRIDE_FLAGS_OFFSET = 18;
 const FIRST_OVERRIDE_BLOCK_OFFSET = 20;
 function walkOverrideBlocks(nonDeletable) {
-	if (nonDeletable.length < FIRST_OVERRIDE_BLOCK_OFFSET) return;
-	const flags = uint16At(nonDeletable, OVERRIDE_FLAGS_OFFSET);
-	const blocks = /* @__PURE__ */ new Map();
-	let cursor = FIRST_OVERRIDE_BLOCK_OFFSET;
-	for (let bit = 15; bit >= 5; bit -= 1) {
-		if ((flags & 1 << bit) === 0) continue;
-		if (bit === OVERRIDE_BIT_HTML) continue;
-		if (cursor + 2 > nonDeletable.length) return;
-		const size = uint16At(nonDeletable, cursor);
-		cursor += 2;
-		if (cursor + size > nonDeletable.length) return;
-		blocks.set(bit, nonDeletable.subarray(cursor, cursor + size));
-		cursor += size;
+	try {
+		const flags = uint16At(nonDeletable, OVERRIDE_FLAGS_OFFSET);
+		const blocks = /* @__PURE__ */ new Map();
+		let cursor = FIRST_OVERRIDE_BLOCK_OFFSET;
+		for (let bit = 15; bit >= 5; bit -= 1) {
+			if ((flags & 1 << bit) === 0) continue;
+			if (bit === OVERRIDE_BIT_HTML) continue;
+			const size = uint16At(nonDeletable, cursor);
+			cursor += 2;
+			if (cursor + size > nonDeletable.length) return;
+			blocks.set(bit, nonDeletable.subarray(cursor, cursor + size));
+			cursor += size;
+		}
+		return {
+			flags,
+			blocks
+		};
+	} catch {
+		return;
 	}
-	return {
-		flags,
-		blocks
-	};
 }
 function readContentType(contentBlock) {
-	if (contentBlock.length < 2) return;
-	const flags = uint16At(contentBlock, 0);
-	let cursor = 2;
-	if ((flags & 32768) !== 0) {
-		if (cursor + 2 > contentBlock.length) return;
-		cursor += 2;
+	try {
+		const flags = uint16At(contentBlock, 0);
+		let cursor = 2;
+		if ((flags & 32768) !== 0) cursor += 2;
+		if ((flags & 16384) === 0) return;
+		return contentBlock[cursor];
+	} catch {
+		return;
 	}
-	if ((flags & 16384) === 0) return;
-	return contentBlock[cursor];
 }
 function readPositionOverride(positionBlock) {
-	if (positionBlock.length < 2) return;
-	const flags = uint16At(positionBlock, 0);
-	let cursor = 2;
-	let widthWpu;
-	let heightWpu;
-	let xWpu;
-	let yWpu;
-	const need = (bytes) => cursor + bytes <= positionBlock.length;
-	if ((flags & 32768) !== 0) {
-		if (!need(2)) return void 0;
-		cursor += 2;
-	}
-	if ((flags & 16384) !== 0) {
-		if (!need(2)) return void 0;
-		cursor += 2;
-	}
-	if ((flags & 8192) !== 0) {
-		if (!need(5)) return void 0;
-		const horizontalFlags = positionBlock[cursor];
-		const offset = uint16At(positionBlock, cursor + 1);
-		if (horizontalFlags !== void 0 && (horizontalFlags & 3) === 0) xWpu = offset;
-		cursor += 5;
-	}
-	if ((flags & 4096) !== 0) {
-		if (!need(3)) return void 0;
-		const verticalFlags = positionBlock[cursor];
-		const offset = uint16At(positionBlock, cursor + 1);
-		if (verticalFlags !== void 0 && (verticalFlags & 3) === 0) yWpu = offset;
-		cursor += 3;
-	}
-	if ((flags & 2048) !== 0) {
-		if (!need(3)) return void 0;
-		widthWpu = uint16At(positionBlock, cursor + 1);
-		cursor += 3;
-	}
-	if ((flags & 1024) !== 0) {
-		if (!need(3)) return void 0;
-		heightWpu = uint16At(positionBlock, cursor + 1);
-		cursor += 3;
+	try {
+		const flags = uint16At(positionBlock, 0);
+		let cursor = 2;
+		let widthWpu;
+		let heightWpu;
+		let xWpu;
+		let yWpu;
+		if ((flags & 32768) !== 0) cursor += 2;
+		if ((flags & 16384) !== 0) cursor += 2;
+		if ((flags & 8192) !== 0) {
+			const horizontalFlags = positionBlock[cursor];
+			const offset = uint16At(positionBlock, cursor + 1);
+			if (horizontalFlags !== void 0 && (horizontalFlags & 3) === 0) xWpu = offset;
+			cursor += 5;
+		}
+		if ((flags & 4096) !== 0) {
+			const verticalFlags = positionBlock[cursor];
+			const offset = uint16At(positionBlock, cursor + 1);
+			if (verticalFlags !== void 0 && (verticalFlags & 3) === 0) yWpu = offset;
+			cursor += 3;
+		}
+		if ((flags & 2048) !== 0) {
+			widthWpu = uint16At(positionBlock, cursor + 1);
+			cursor += 3;
+		}
+		if ((flags & 1024) !== 0) heightWpu = uint16At(positionBlock, cursor + 1);
+		return {
+			widthWpu,
+			heightWpu,
+			xWpu,
+			yWpu
+		};
+	} catch {
+		return;
 	}
-	return {
-		widthWpu,
-		heightWpu,
-		xWpu,
-		yWpu
-	};
 }
 const BOX_CONTENT_TYPE_TEXT = 1;
 const BOX_CONTENT_TYPE_LINKED_TEXT = 2;

package/dist/stream/characters.cjs

@@ -179,6 +179,7 @@ function decodeSingleByteCharacter(byte) {
 	if (shorthand !== void 0) return shorthand;
 	if (byte >= 33 && byte <= 127) return String.fromCharCode(byte);
 }
+const UNBOUNDED_WORDS = Number.POSITIVE_INFINITY;
 function decodeWordString(bytes, offset, maxWords) {
 	let text = "";
 	let wordsRead = 0;
@@ -198,6 +199,7 @@ function decodeWordString(bytes, offset, maxWords) {
 //#endregion
 exports.FIRST_ASCII_CHARACTER = FIRST_ASCII_CHARACTER;
 exports.LAST_CHARACTER = LAST_CHARACTER;
+exports.UNBOUNDED_WORDS = UNBOUNDED_WORDS;
 exports.UNMAPPED_CHARACTER = UNMAPPED_CHARACTER;
 exports.decodeSingleByteCharacter = decodeSingleByteCharacter;
 exports.decodeWordString = decodeWordString;

package/dist/stream/characters.d.cts

@@ -4,9 +4,10 @@ declare const LAST_CHARACTER = 127;
 declare const UNMAPPED_CHARACTER = "�";
 declare function decodeWpCharacter(characterSet: number, characterNumber: number): string | undefined;
 declare function decodeSingleByteCharacter(byte: number): string | undefined;
+declare const UNBOUNDED_WORDS: number;
 declare function decodeWordString(bytes: Uint8Array, offset: number, maxWords: number): {
   text: string;
   wordsRead: number;
 };
 //#endregion
-export { FIRST_ASCII_CHARACTER, LAST_CHARACTER, UNMAPPED_CHARACTER, decodeSingleByteCharacter, decodeWordString, decodeWpCharacter };
+export { FIRST_ASCII_CHARACTER, LAST_CHARACTER, UNBOUNDED_WORDS, UNMAPPED_CHARACTER, decodeSingleByteCharacter, decodeWordString, decodeWpCharacter };

package/dist/stream/characters.d.ts

@@ -4,9 +4,10 @@ declare const LAST_CHARACTER = 127;
 declare const UNMAPPED_CHARACTER = "�";
 declare function decodeWpCharacter(characterSet: number, characterNumber: number): string | undefined;
 declare function decodeSingleByteCharacter(byte: number): string | undefined;
+declare const UNBOUNDED_WORDS: number;
 declare function decodeWordString(bytes: Uint8Array, offset: number, maxWords: number): {
   text: string;
   wordsRead: number;
 };
 //#endregion
-export { FIRST_ASCII_CHARACTER, LAST_CHARACTER, UNMAPPED_CHARACTER, decodeSingleByteCharacter, decodeWordString, decodeWpCharacter };
+export { FIRST_ASCII_CHARACTER, LAST_CHARACTER, UNBOUNDED_WORDS, UNMAPPED_CHARACTER, decodeSingleByteCharacter, decodeWordString, decodeWpCharacter };

package/dist/stream/characters.js

@@ -178,6 +178,7 @@ function decodeSingleByteCharacter(byte) {
 	if (shorthand !== void 0) return shorthand;
 	if (byte >= 33 && byte <= 127) return String.fromCharCode(byte);
 }
+const UNBOUNDED_WORDS = Number.POSITIVE_INFINITY;
 function decodeWordString(bytes, offset, maxWords) {
 	let text = "";
 	let wordsRead = 0;
@@ -195,4 +196,4 @@ function decodeWordString(bytes, offset, maxWords) {
 	};
 }
 //#endregion
-export { FIRST_ASCII_CHARACTER, LAST_CHARACTER, UNMAPPED_CHARACTER, decodeSingleByteCharacter, decodeWordString, decodeWpCharacter };
+export { FIRST_ASCII_CHARACTER, LAST_CHARACTER, UNBOUNDED_WORDS, UNMAPPED_CHARACTER, decodeSingleByteCharacter, decodeWordString, decodeWpCharacter };

package/dist/stream/formula.cjs

@@ -163,14 +163,11 @@ function readLengthPrefixedWordString(cursor) {
 	cursor.offset += length * 2;
 	return text;
 }
-function readLengthPrefixedByteString(cursor) {
-	if (cursor.offset + 2 > cursor.bytes.length) return;
-	const length = require_bytes_view.uint16At(cursor.bytes, cursor.offset);
+function skipLengthPrefixedByteString(cursor) {
+	const length = require_bytes_view.uint16At(require_bytes_view.sliceAt(cursor.bytes, cursor.offset, 2), 0);
 	cursor.offset += 2;
-	if (cursor.offset + length > cursor.bytes.length) return;
-	const slice = cursor.bytes.subarray(cursor.offset, cursor.offset + length);
+	require_bytes_view.sliceAt(cursor.bytes, cursor.offset, length);
 	cursor.offset += length;
-	return Array.from(slice, (byte) => String.fromCharCode(byte)).join("");
 }
 function readCellNumber(cursor) {
 	if (cursor.offset + 4 > cursor.bytes.length) return;
@@ -224,17 +221,20 @@ function readToken(cursor) {
 		}
 		case 28: {
 			const start = readCellNumber(cursor);
-			const end = start === void 0 ? void 0 : readCellNumber(cursor);
+			const end = readCellNumber(cursor);
 			if (start === void 0 || end === void 0) return;
 			const startText = cellReferenceText(start.row, start.column, false, false);
 			const endText = cellReferenceText(end.row, end.column, false, false);
 			return startText === void 0 || endText === void 0 ? void 0 : `${startText}:${endText}`;
 		}
-		case 30: {
-			if (cursor.offset + 8 > cursor.bytes.length) return;
-			const value = new DataView(cursor.bytes.buffer, cursor.bytes.byteOffset + cursor.offset, 8).getFloat64(0, true);
+		case 30: try {
+			const doubleBytes = require_bytes_view.sliceAt(cursor.bytes, cursor.offset, 8);
+			const value = new DataView(doubleBytes.buffer, doubleBytes.byteOffset, 8).getFloat64(0, true);
 			cursor.offset += 8;
-			return readLengthPrefixedByteString(cursor) === void 0 ? void 0 : String(value);
+			skipLengthPrefixedByteString(cursor);
+			return String(value);
+		} catch {
+			return;
 		}
 		case 31: {
 			if (cursor.offset + 2 > cursor.bytes.length) return;
@@ -245,24 +245,22 @@ function readToken(cursor) {
 		case 32: return readLengthPrefixedWordString(cursor);
 		case 41:
 		case 42:
-			cursor.offset += 2;
-			return "";
 		case 43:
 			cursor.offset += 2;
 			return "";
 		case 44: return "";
 		default:
 			if (code >= 48 && code <= 63) {
-				const flags = code - 48;
+				const flags = code & 15;
 				const start = readCellNumber(cursor);
-				const end = start === void 0 ? void 0 : readCellNumber(cursor);
+				const end = readCellNumber(cursor);
 				if (start === void 0 || end === void 0) return;
 				const startText = cellReferenceText(start.row, start.column, (flags & 4) !== 0, (flags & 8) !== 0);
 				const endText = cellReferenceText(end.row, end.column, (flags & 1) !== 0, (flags & 2) !== 0);
 				return startText === void 0 || endText === void 0 ? void 0 : `${startText}:${endText}`;
 			}
 			if (code >= 64 && code <= 67) {
-				const flags = code - 64;
+				const flags = code & 3;
 				const cell = readCellNumber(cursor);
 				return cell === void 0 ? void 0 : cellReferenceText(cell.row, cell.column, (flags & 1) !== 0, (flags & 2) !== 0);
 			}

package/dist/stream/formula.js

@@ -1,4 +1,4 @@
-import { int16At, uint16At } from "../bytes/view.js";
+import { int16At, sliceAt, uint16At } from "../bytes/view.js";
 import { decodeWordString } from "./characters.js";
 //#region src/stream/formula.ts
 const GROUP1_FUNCTIONS = /* @__PURE__ */ new Map([
@@ -162,14 +162,11 @@ function readLengthPrefixedWordString(cursor) {
 	cursor.offset += length * 2;
 	return text;
 }
-function readLengthPrefixedByteString(cursor) {
-	if (cursor.offset + 2 > cursor.bytes.length) return;
-	const length = uint16At(cursor.bytes, cursor.offset);
+function skipLengthPrefixedByteString(cursor) {
+	const length = uint16At(sliceAt(cursor.bytes, cursor.offset, 2), 0);
 	cursor.offset += 2;
-	if (cursor.offset + length > cursor.bytes.length) return;
-	const slice = cursor.bytes.subarray(cursor.offset, cursor.offset + length);
+	sliceAt(cursor.bytes, cursor.offset, length);
 	cursor.offset += length;
-	return Array.from(slice, (byte) => String.fromCharCode(byte)).join("");
 }
 function readCellNumber(cursor) {
 	if (cursor.offset + 4 > cursor.bytes.length) return;
@@ -223,17 +220,20 @@ function readToken(cursor) {
 		}
 		case 28: {
 			const start = readCellNumber(cursor);
-			const end = start === void 0 ? void 0 : readCellNumber(cursor);
+			const end = readCellNumber(cursor);
 			if (start === void 0 || end === void 0) return;
 			const startText = cellReferenceText(start.row, start.column, false, false);
 			const endText = cellReferenceText(end.row, end.column, false, false);
 			return startText === void 0 || endText === void 0 ? void 0 : `${startText}:${endText}`;
 		}
-		case 30: {
-			if (cursor.offset + 8 > cursor.bytes.length) return;
-			const value = new DataView(cursor.bytes.buffer, cursor.bytes.byteOffset + cursor.offset, 8).getFloat64(0, true);
+		case 30: try {
+			const doubleBytes = sliceAt(cursor.bytes, cursor.offset, 8);
+			const value = new DataView(doubleBytes.buffer, doubleBytes.byteOffset, 8).getFloat64(0, true);
 			cursor.offset += 8;
-			return readLengthPrefixedByteString(cursor) === void 0 ? void 0 : String(value);
+			skipLengthPrefixedByteString(cursor);
+			return String(value);
+		} catch {
+			return;
 		}
 		case 31: {
 			if (cursor.offset + 2 > cursor.bytes.length) return;
@@ -244,24 +244,22 @@ function readToken(cursor) {
 		case 32: return readLengthPrefixedWordString(cursor);
 		case 41:
 		case 42:
-			cursor.offset += 2;
-			return "";
 		case 43:
 			cursor.offset += 2;
 			return "";
 		case 44: return "";
 		default:
 			if (code >= 48 && code <= 63) {
-				const flags = code - 48;
+				const flags = code & 15;
 				const start = readCellNumber(cursor);
-				const end = start === void 0 ? void 0 : readCellNumber(cursor);
+				const end = readCellNumber(cursor);
 				if (start === void 0 || end === void 0) return;
 				const startText = cellReferenceText(start.row, start.column, (flags & 4) !== 0, (flags & 8) !== 0);
 				const endText = cellReferenceText(end.row, end.column, (flags & 1) !== 0, (flags & 2) !== 0);
 				return startText === void 0 || endText === void 0 ? void 0 : `${startText}:${endText}`;
 			}
 			if (code >= 64 && code <= 67) {
-				const flags = code - 64;
+				const flags = code & 3;
 				const cell = readCellNumber(cursor);
 				return cell === void 0 ? void 0 : cellReferenceText(cell.row, cell.column, (flags & 1) !== 0, (flags & 2) !== 0);
 			}

package/dist/stream/image.cjs

@@ -12,61 +12,75 @@ const PNG_SIGNATURE = [
 	10
 ];
 const JPEG_SOI = [255, 216];
+function bytesMatchAt(bytes, index, signature) {
+	return signature.every((byte, offset) => require_bytes_view.byteAt(bytes, index + offset) === byte);
+}
 function indexOf(bytes, needle, from) {
-	outer: for (let i = from; i + needle.length <= bytes.length; i += 1) {
-		for (let j = 0; j < needle.length; j += 1) if (bytes[i + j] !== needle[j]) continue outer;
-		return i;
-	}
+	for (let index = from;; index += 1) if (bytesMatchAt(bytes, index, needle)) return index;
+}
+function bigEndianUint32At(bytes, offset) {
+	return require_bytes_view.byteAt(bytes, offset) * 16777216 + require_bytes_view.byteAt(bytes, offset + 1) * 65536 + require_bytes_view.byteAt(bytes, offset + 2) * 256 + require_bytes_view.byteAt(bytes, offset + 3);
+}
+function bigEndianUint16At(bytes, offset) {
+	return require_bytes_view.byteAt(bytes, offset) * 256 + require_bytes_view.byteAt(bytes, offset + 1);
 }
 function scanPng(bytes, signatureAt) {
-	const view = new DataView(bytes.buffer, bytes.byteOffset, bytes.byteLength);
 	let cursor = signatureAt + PNG_SIGNATURE.length;
-	for (;;) {
-		if (cursor + 8 > bytes.length) return;
-		const length = view.getUint32(cursor);
-		const type = String.fromCharCode(require_bytes_view.byteAt(bytes, cursor + 4), require_bytes_view.byteAt(bytes, cursor + 5), require_bytes_view.byteAt(bytes, cursor + 6), require_bytes_view.byteAt(bytes, cursor + 7));
-		cursor += 8 + length + 4;
-		if (cursor > bytes.length) return;
-		if (type === "IEND") return {
-			format: "png",
-			bytes: bytes.subarray(signatureAt, cursor)
-		};
+	try {
+		for (;;) {
+			const length = bigEndianUint32At(bytes, cursor);
+			const type = String.fromCharCode(require_bytes_view.byteAt(bytes, cursor + 4), require_bytes_view.byteAt(bytes, cursor + 5), require_bytes_view.byteAt(bytes, cursor + 6), require_bytes_view.byteAt(bytes, cursor + 7));
+			cursor += 8 + length + 4;
+			if (type === "IEND") return {
+				format: "png",
+				bytes: require_bytes_view.sliceAt(bytes, signatureAt, cursor - signatureAt)
+			};
+		}
+	} catch {
+		return;
 	}
 }
 function scanJpeg(bytes, soiAt) {
-	const view = new DataView(bytes.buffer, bytes.byteOffset, bytes.byteLength);
 	let cursor = soiAt + JPEG_SOI.length;
-	for (;;) {
-		if (cursor >= bytes.length) return;
-		if (require_bytes_view.byteAt(bytes, cursor) !== 255) return;
-		while (cursor < bytes.length && require_bytes_view.byteAt(bytes, cursor) === 255) cursor += 1;
-		if (cursor >= bytes.length) return;
-		const marker = require_bytes_view.byteAt(bytes, cursor);
-		cursor += 1;
-		if (marker === 216 || marker === 1 || marker >= 208 && marker <= 215) continue;
-		if (marker === 217) return {
-			format: "jpeg",
-			bytes: bytes.subarray(soiAt, cursor)
-		};
-		if (cursor + 2 > bytes.length) return;
-		const length = view.getUint16(cursor);
-		if (length < 2 || cursor + length > bytes.length) return;
-		cursor += length;
-		if (marker === 218) {
-			const eoi = indexOf(bytes, [255, 217], cursor);
-			if (eoi === void 0) return;
-			return {
+	try {
+		for (;;) {
+			if (require_bytes_view.byteAt(bytes, cursor) !== 255) return;
+			while (require_bytes_view.byteAt(bytes, cursor) === 255) cursor += 1;
+			const marker = require_bytes_view.byteAt(bytes, cursor);
+			cursor += 1;
+			if (marker === 216 || marker === 1 || marker >= 208 && marker <= 215) continue;
+			if (marker === 217) return {
 				format: "jpeg",
-				bytes: bytes.subarray(soiAt, eoi + 2)
+				bytes: bytes.subarray(soiAt, cursor)
 			};
+			const length = bigEndianUint16At(bytes, cursor);
+			if (length < 2) return;
+			cursor += require_bytes_view.sliceAt(bytes, cursor, length).length;
+			if (marker === 218) {
+				const eoi = indexOf(bytes, [255, 217], cursor);
+				return {
+					format: "jpeg",
+					bytes: bytes.subarray(soiAt, eoi + 2)
+				};
+			}
 		}
+	} catch {
+		return;
 	}
 }
 function scanImagePayload(bytes) {
-	const pngAt = indexOf(bytes, PNG_SIGNATURE, 0);
-	const jpegAt = indexOf(bytes, JPEG_SOI, 0);
-	if (pngAt !== void 0 && (jpegAt === void 0 || pngAt < jpegAt)) return scanPng(bytes, pngAt);
-	if (jpegAt !== void 0) return scanJpeg(bytes, jpegAt);
+	try {
+		for (let index = 0;; index += 1) {
+			try {
+				if (bytesMatchAt(bytes, index, PNG_SIGNATURE)) return scanPng(bytes, index);
+			} catch {}
+			if (bytesMatchAt(bytes, index, JPEG_SOI)) return scanJpeg(bytes, index);
+		}
+	} catch {
+		return;
+	}
 }
 //#endregion
+exports.bigEndianUint16At = bigEndianUint16At;
+exports.bigEndianUint32At = bigEndianUint32At;
 exports.scanImagePayload = scanImagePayload;

package/dist/stream/image.d.cts

@@ -3,6 +3,8 @@ interface WpdImagePayload {
   readonly format: "png" | "jpeg";
   readonly bytes: Uint8Array;
 }
+declare function bigEndianUint32At(bytes: Uint8Array, offset: number): number;
+declare function bigEndianUint16At(bytes: Uint8Array, offset: number): number;
 declare function scanImagePayload(bytes: Uint8Array): WpdImagePayload | undefined;
 //#endregion
-export { WpdImagePayload, scanImagePayload };
+export { WpdImagePayload, bigEndianUint16At, bigEndianUint32At, scanImagePayload };

package/dist/stream/image.d.ts

@@ -3,6 +3,8 @@ interface WpdImagePayload {
   readonly format: "png" | "jpeg";
   readonly bytes: Uint8Array;
 }
+declare function bigEndianUint32At(bytes: Uint8Array, offset: number): number;
+declare function bigEndianUint16At(bytes: Uint8Array, offset: number): number;
 declare function scanImagePayload(bytes: Uint8Array): WpdImagePayload | undefined;
 //#endregion
-export { WpdImagePayload, scanImagePayload };
+export { WpdImagePayload, bigEndianUint16At, bigEndianUint32At, scanImagePayload };

package/dist/stream/image.js

@@ -1,4 +1,4 @@
-import { byteAt } from "../bytes/view.js";
+import { byteAt, sliceAt } from "../bytes/view.js";
 //#region src/stream/image.ts
 const PNG_SIGNATURE = [
 	137,
@@ -11,61 +11,73 @@ const PNG_SIGNATURE = [
 	10
 ];
 const JPEG_SOI = [255, 216];
+function bytesMatchAt(bytes, index, signature) {
+	return signature.every((byte, offset) => byteAt(bytes, index + offset) === byte);
+}
 function indexOf(bytes, needle, from) {
-	outer: for (let i = from; i + needle.length <= bytes.length; i += 1) {
-		for (let j = 0; j < needle.length; j += 1) if (bytes[i + j] !== needle[j]) continue outer;
-		return i;
-	}
+	for (let index = from;; index += 1) if (bytesMatchAt(bytes, index, needle)) return index;
+}
+function bigEndianUint32At(bytes, offset) {
+	return byteAt(bytes, offset) * 16777216 + byteAt(bytes, offset + 1) * 65536 + byteAt(bytes, offset + 2) * 256 + byteAt(bytes, offset + 3);
+}
+function bigEndianUint16At(bytes, offset) {
+	return byteAt(bytes, offset) * 256 + byteAt(bytes, offset + 1);
 }
 function scanPng(bytes, signatureAt) {
-	const view = new DataView(bytes.buffer, bytes.byteOffset, bytes.byteLength);
 	let cursor = signatureAt + PNG_SIGNATURE.length;
-	for (;;) {
-		if (cursor + 8 > bytes.length) return;
-		const length = view.getUint32(cursor);
-		const type = String.fromCharCode(byteAt(bytes, cursor + 4), byteAt(bytes, cursor + 5), byteAt(bytes, cursor + 6), byteAt(bytes, cursor + 7));
-		cursor += 8 + length + 4;
-		if (cursor > bytes.length) return;
-		if (type === "IEND") return {
-			format: "png",
-			bytes: bytes.subarray(signatureAt, cursor)
-		};
+	try {
+		for (;;) {
+			const length = bigEndianUint32At(bytes, cursor);
+			const type = String.fromCharCode(byteAt(bytes, cursor + 4), byteAt(bytes, cursor + 5), byteAt(bytes, cursor + 6), byteAt(bytes, cursor + 7));
+			cursor += 8 + length + 4;
+			if (type === "IEND") return {
+				format: "png",
+				bytes: sliceAt(bytes, signatureAt, cursor - signatureAt)
+			};
+		}
+	} catch {
+		return;
 	}
 }
 function scanJpeg(bytes, soiAt) {
-	const view = new DataView(bytes.buffer, bytes.byteOffset, bytes.byteLength);
 	let cursor = soiAt + JPEG_SOI.length;
-	for (;;) {
-		if (cursor >= bytes.length) return;
-		if (byteAt(bytes, cursor) !== 255) return;
-		while (cursor < bytes.length && byteAt(bytes, cursor) === 255) cursor += 1;
-		if (cursor >= bytes.length) return;
-		const marker = byteAt(bytes, cursor);
-		cursor += 1;
-		if (marker === 216 || marker === 1 || marker >= 208 && marker <= 215) continue;
-		if (marker === 217) return {
-			format: "jpeg",
-			bytes: bytes.subarray(soiAt, cursor)
-		};
-		if (cursor + 2 > bytes.length) return;
-		const length = view.getUint16(cursor);
-		if (length < 2 || cursor + length > bytes.length) return;
-		cursor += length;
-		if (marker === 218) {
-			const eoi = indexOf(bytes, [255, 217], cursor);
-			if (eoi === void 0) return;
-			return {
+	try {
+		for (;;) {
+			if (byteAt(bytes, cursor) !== 255) return;
+			while (byteAt(bytes, cursor) === 255) cursor += 1;
+			const marker = byteAt(bytes, cursor);
+			cursor += 1;
+			if (marker === 216 || marker === 1 || marker >= 208 && marker <= 215) continue;
+			if (marker === 217) return {
 				format: "jpeg",
-				bytes: bytes.subarray(soiAt, eoi + 2)
+				bytes: bytes.subarray(soiAt, cursor)
 			};
+			const length = bigEndianUint16At(bytes, cursor);
+			if (length < 2) return;
+			cursor += sliceAt(bytes, cursor, length).length;
+			if (marker === 218) {
+				const eoi = indexOf(bytes, [255, 217], cursor);
+				return {
+					format: "jpeg",
+					bytes: bytes.subarray(soiAt, eoi + 2)
+				};
+			}
 		}
+	} catch {
+		return;
 	}
 }
 function scanImagePayload(bytes) {
-	const pngAt = indexOf(bytes, PNG_SIGNATURE, 0);
-	const jpegAt = indexOf(bytes, JPEG_SOI, 0);
-	if (pngAt !== void 0 && (jpegAt === void 0 || pngAt < jpegAt)) return scanPng(bytes, pngAt);
-	if (jpegAt !== void 0) return scanJpeg(bytes, jpegAt);
+	try {
+		for (let index = 0;; index += 1) {
+			try {
+				if (bytesMatchAt(bytes, index, PNG_SIGNATURE)) return scanPng(bytes, index);
+			} catch {}
+			if (bytesMatchAt(bytes, index, JPEG_SOI)) return scanJpeg(bytes, index);
+		}
+	} catch {
+		return;
+	}
 }
 //#endregion
-export { scanImagePayload };
+export { bigEndianUint16At, bigEndianUint32At, scanImagePayload };

package/dist/stream/ole.cjs

@@ -25,7 +25,7 @@ function readOleDescriptor(bytes) {
 	let marker = "";
 	for (let index = 0; index < 42; index += 1) marker += String.fromCharCode(require_bytes_view.byteAt(bytes, index));
 	if (marker === OLE2_MARKER) {
-		const { text } = require_stream_characters.decodeWordString(bytes, payloadOffset, (bytes.length - payloadOffset) / 2);
+		const { text } = require_stream_characters.decodeWordString(bytes, payloadOffset, require_stream_characters.UNBOUNDED_WORDS);
 		if (text.length === 0) return;
 		return {
 			ole2: true,

package/dist/stream/ole.js

@@ -1,5 +1,5 @@
 import { byteAt, uint16At, uint32At } from "../bytes/view.js";
-import { decodeWordString } from "./characters.js";
+import { UNBOUNDED_WORDS, decodeWordString } from "./characters.js";
 import { packetByPrefixId } from "../container/prefix.js";
 //#region src/stream/ole.ts
 const PACKET_TYPE_GRAPHICS_FILENAME = 64;
@@ -24,7 +24,7 @@ function readOleDescriptor(bytes) {
 	let marker = "";
 	for (let index = 0; index < 42; index += 1) marker += String.fromCharCode(byteAt(bytes, index));
 	if (marker === OLE2_MARKER) {
-		const { text } = decodeWordString(bytes, payloadOffset, (bytes.length - payloadOffset) / 2);
+		const { text } = decodeWordString(bytes, payloadOffset, UNBOUNDED_WORDS);
 		if (text.length === 0) return;
 		return {
 			ole2: true,