Reduced uses of Buffer

shockpkg · Sep 24, 2023 · ab46130 · ab46130
1 parent 5284344
commit ab46130
Show file tree

Hide file tree

Showing 5 changed files with 89 additions and 43 deletions.
diff --git a/src/icon.ts b/src/icon.ts
@@ -59,5 +59,5 @@ export abstract class Icon {
 	 *
 	 * @returns Encoded icon.
 	 */
-	public abstract encode(): Buffer;
+	public abstract encode(): Uint8Array;
 }
diff --git a/src/icon/icns.test.ts b/src/icon/icns.test.ts
@@ -67,7 +67,7 @@ void describe('icon/icns', () => {
 							);
 							icns.addFromPng(png, types);
 						}
-						const data = icns.encode();
+						const data = Buffer.from(icns.encode());
 						await mkdir(dirname(dest), {recursive: true});
 						await writeFile(dest, data);
 					});
@@ -87,7 +87,7 @@ void describe('icon/icns', () => {
 								specIconFilePng(name, size)
 							);
 							icns.addFromPng(png, types, raw);
-							const data = icns.encode();
+							const data = Buffer.from(icns.encode());
 							await mkdir(dirname(dest), {recursive: true});
 							await writeFile(dest, data);
 						});

diff --git a/src/icon/icns.ts b/src/icon/icns.ts
@@ -2,6 +2,7 @@ import {encode as packbitsEncode} from '@fiahfy/packbits';
 
 import {IImageData} from '../types';
 import {Icon} from '../icon';
+import {concatUint8Arrays} from '../util';
 
 const typeArgb = ['ic04', 'ic05'];
 
@@ -36,7 +37,7 @@ export interface IIconIcnsEntry {
 	/**
 	 * Icon data.
 	 */
-	readonly data: Readonly<Buffer>;
+	readonly data: Readonly<Uint8Array>;
 }
 
 /**
@@ -101,7 +102,7 @@ export class IconIcns extends Icon {
 			if (this._typePng.has(type)) {
 				this.entries.push({
 					type,
-					data: Buffer.concat([data as Buffer], data.length)
+					data: new Uint8Array(data)
 				});
 				continue;
 			}
@@ -132,33 +133,54 @@ export class IconIcns extends Icon {
 	 */
 	public encode() {
 		const {toc} = this;
-		const head = Buffer.alloc(8);
-		head.write('icns', 0);
+		const headName = new Uint8Array([105, 99, 110, 115]);
+		const headSize = new Uint8Array(4);
 		let size = 8;
-		let tocSize = 8;
-		const tocHead = toc ? Buffer.from('TOC ----') : null;
-		const tocs = tocHead ? [tocHead] : [];
-		const images = [];
+		let tocSizeValue = 8;
+		const tocs = toc
+			? [new Uint8Array([84, 79, 67, 32]), new Uint8Array(4)]
+			: null;
+		const imgs = [];
 		for (const {type, data} of this.entries) {
-			const tagType = Buffer.alloc(4);
-			tagType.write(type, 0);
-			const tagSize = Buffer.alloc(4);
-			const tagSizeValue = data.length + 8;
-			tagSize.writeUInt32BE(tagSizeValue, 0);
-			if (toc) {
-				tocs.push(tagType, tagSize);
-				tocSize += 8;
+			const imgName = new Uint8Array(4);
+			for (let i = 0; i < 4; i++) {
+				imgName[i] = type.charCodeAt(i) || 0;
+			}
+			const imgSize = new Uint8Array(4);
+			const imgSizeValue = data.length + 8;
+			new DataView(
+				imgSize.buffer,
+				imgSize.byteOffset,
+				imgSize.byteLength
+			).setUint32(0, imgSizeValue, false);
+			if (tocs) {
+				tocs.push(imgName, imgSize);
+				tocSizeValue += 8;
 				size += 8;
 			}
-			images.push(tagType, tagSize, data);
-			size += tagSizeValue;
+			imgs.push(imgName, imgSize, data);
+			size += imgSizeValue;
 		}
-		if (tocHead) {
-			tocHead.writeUInt32BE(tocSize, 4);
+		if (tocs) {
+			const [, tocSize] = tocs;
+			new DataView(
+				tocSize.buffer,
+				tocSize.byteOffset,
+				tocSize.byteLength
+			).setUint32(0, tocSizeValue, false);
 			size += 8;
 		}
-		head.writeUInt32BE(size, 4);
-		return Buffer.concat([head, ...tocs, ...images], size);
+		new DataView(
+			headSize.buffer,
+			headSize.byteOffset,
+			headSize.byteLength
+		).setUint32(0, size, false);
+		return concatUint8Arrays([
+			headName,
+			headSize,
+			...(tocs || []),
+			...imgs
+		]);
 	}
 
 	/**
@@ -214,7 +236,7 @@ export class IconIcns extends Icon {
 		return this._encodeRgbaToPackBits(
 			imageData,
 			true,
-			Buffer.from('ARGB', 'ascii')
+			new Uint8Array([65, 82, 71, 66])
 		);
 	}
 
@@ -247,7 +269,7 @@ export class IconIcns extends Icon {
 		return this._encodeRgbaToPackBits(
 			imageData,
 			false,
-			type === 'it32' ? Buffer.alloc(4) : null
+			type === 'it32' ? new Uint8Array(4) : null
 		);
 	}
 
@@ -276,9 +298,9 @@ export class IconIcns extends Icon {
 	protected _encodeRgbaToPackBits(
 		imageData: Readonly<IImageData>,
 		alpha: boolean,
-		header: Readonly<Buffer> | null = null
+		header: Readonly<Uint8Array> | null = null
 	) {
-		const pieces = header ? [header] : [];
+		const pieces: Uint8Array[] = header ? [header] : [];
 		if (alpha) {
 			// A:
 			pieces.push(
@@ -291,7 +313,7 @@ export class IconIcns extends Icon {
 			this._encodePackBitsIcns(this._encodeRgbaChannel(imageData, 1)),
 			this._encodePackBitsIcns(this._encodeRgbaChannel(imageData, 2))
 		);
-		return Buffer.concat(pieces as Buffer[]);
+		return concatUint8Arrays(pieces);
 	}
 
 	/**
@@ -307,9 +329,9 @@ export class IconIcns extends Icon {
 	) {
 		const {data} = imageData;
 		const size = data.length;
-		const encoded = Buffer.alloc(size / 4);
+		const encoded = new Uint8Array(size / 4);
 		for (let i = index, j = 0; i < size; i += 4) {
-			encoded.writeUInt8(data[i], j++);
+			encoded[j++] = data[i];
 		}
 		return encoded;
 	}
@@ -320,9 +342,13 @@ export class IconIcns extends Icon {
 	 * @param data Data to be compressed.
 	 * @returns Compressed data.
 	 */
-	protected _encodePackBitsIcns(data: Readonly<Buffer>) {
-		return packbitsEncode(data as Buffer, {
-			format: 'icns'
-		});
+	protected _encodePackBitsIcns(data: Readonly<Uint8Array>) {
+		const b = packbitsEncode(
+			Buffer.from(data.buffer, data.byteOffset, data.byteLength),
+			{
+				format: 'icns'
+			}
+		);
+		return new Uint8Array(b.buffer, b.byteOffset, b.byteLength);
 	}
 }
diff --git a/src/icon/ico.test.ts b/src/icon/ico.test.ts
@@ -21,7 +21,7 @@ void describe('icon/ico', () => {
 						const png = await readFile(specIconFilePng(name, size));
 						ico.addFromPng(png);
 					}
-					const data = ico.encode();
+					const data = Buffer.from(ico.encode());
 					await mkdir(dirname(dest), {recursive: true});
 					await writeFile(dest, data);
 				});
@@ -34,7 +34,7 @@ void describe('icon/ico', () => {
 						const png = await readFile(specIconFilePng(name, size));
 						ico.addFromPng(png, false);
 					}
-					const data = ico.encode();
+					const data = Buffer.from(ico.encode());
 					await mkdir(dirname(dest), {recursive: true});
 					await writeFile(dest, data);
 				});
@@ -47,7 +47,7 @@ void describe('icon/ico', () => {
 						const png = await readFile(specIconFilePng(name, size));
 						ico.addFromPng(png, true);
 					}
-					const data = ico.encode();
+					const data = Buffer.from(ico.encode());
 					await mkdir(dirname(dest), {recursive: true});
 					await writeFile(dest, data);
 				});
@@ -58,7 +58,7 @@ void describe('icon/ico', () => {
 						const ico = new IconIco();
 						const png = await readFile(specIconFilePng(name, size));
 						ico.addFromPng(png);
-						const data = ico.encode();
+						const data = Buffer.from(ico.encode());
 						await mkdir(dirname(dest), {recursive: true});
 						await writeFile(dest, data);
 					});
@@ -70,7 +70,7 @@ void describe('icon/ico', () => {
 						const ico = new IconIco();
 						const png = await readFile(specIconFilePng(name, size));
 						ico.addFromPng(png, false);
-						const data = ico.encode();
+						const data = Buffer.from(ico.encode());
 						await mkdir(dirname(dest), {recursive: true});
 						await writeFile(dest, data);
 					});
@@ -82,7 +82,7 @@ void describe('icon/ico', () => {
 						const ico = new IconIco();
 						const png = await readFile(specIconFilePng(name, size));
 						ico.addFromPng(png, true);
-						const data = ico.encode();
+						const data = Buffer.from(ico.encode());
 						await mkdir(dirname(dest), {recursive: true});
 						await writeFile(dest, data);
 					});
@@ -98,7 +98,7 @@ void describe('icon/ico', () => {
 						const ico = new IconIco();
 						const png = await readFile(specIconFilePng(name, size));
 						ico.addFromPng(png, true, true);
-						const data = ico.encode();
+						const data = Buffer.from(ico.encode());
 						await mkdir(dirname(dest), {recursive: true});
 						await writeFile(dest, data);
 					});

diff --git a/src/util.ts b/src/util.ts
@@ -1,5 +1,25 @@
 import {IPngIhdr} from './types';
 
+/**
+ * Concatenate multiple Uint8Array together.
+ *
+ * @param arrays Uint8Array arrays.
+ * @returns Uint8Array array.
+ */
+export function concatUint8Arrays(arrays: Readonly<Uint8Array>[]) {
+	let l = 0;
+	for (const a of arrays) {
+		l += a.length;
+	}
+	const r = new Uint8Array(l);
+	let i = 0;
+	for (const a of arrays) {
+		r.set(a, i);
+		i += a.length;
+	}
+	return r;
+}
+
 /**
  * Read PNG IHDR data.
  *