1.7.0

tgpholly · Nov 26, 2024 · 05162e0 · 05162e0
1 parent ceffc3e
commit 05162e0
Show file tree

Hide file tree

Showing 10 changed files with 153 additions and 28 deletions.
diff --git a/base/ReaderBase.ts b/base/ReaderBase.ts
@@ -51,7 +51,7 @@ export class ReaderBase {
 		return Boolean(this.readUByte());
 	}
 
-	public readShortString() {
+	public readUShortString() {
 		const length = this.readUByte();
 		let text = "";
 
@@ -62,6 +62,17 @@ export class ReaderBase {
 		return text;
 	}
 
+	public readShortString() {
+		const length = this.readByte();
+		let text = "";
+
+		for (let i = 0; i < length; i++) {
+			text += String.fromCharCode(this.readByte());
+		}
+
+		return text;
+	}
+
 	public readBytesAsString(bytesToRead:number) {
 		let text = "";
 

diff --git a/base/WriterBase.ts b/base/WriterBase.ts
@@ -91,4 +91,24 @@ export class WriterBase {
 
 		return this;
 	}
+
+	public writeUShortString(text:string) {
+		this.writeUByte(text.length);
+
+		for (let i = 0; i < text.length; i++) {
+			this.writeUByte(text.charCodeAt(i));
+		}
+
+		return this;
+	}
+
+	public writeShortString(text:string) {
+		this.writeByte(text.length);
+
+		for (let i = 0; i < text.length; i++) {
+			this.writeByte(text.charCodeAt(i));
+		}
+
+		return this;
+	}
 }
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "bufferstuff",
-	"version": "1.5.1",
+	"version": "1.6.0",
 	"description": "A set of utility classes for reading and writing binary data in NodeJS and the browser",
 	"main": "./lib/index.js",
 	"types": "./lib/index.d.ts",

diff --git a/readers/IReader.ts b/readers/IReader.ts
@@ -9,6 +9,7 @@ export interface IReader {
 	readByte(): number,
 	readUByte(): number,
 	readBool(): boolean,
+	readUShortString(): string,
 	readShortString(): string,
 	readBytesAsString(bytesToRead:number): string,
 	readShort(): number,
@@ -19,7 +20,9 @@ export interface IReader {
 	readULong(): bigint,
 	readFloat(): number,
 	readDouble(): number,
+	readUString(): string,
 	readString(): string,
 	readShortsAsString(shortsToRead:number): string,
+	readUString16(): string,
 	readString16(): string,
 }
diff --git a/readers/ReaderBE.ts b/readers/ReaderBE.ts
@@ -36,7 +36,7 @@ export class ReaderBE extends ReaderBase implements IReader {
 	}
 
 	public readULong() {
-		const value = this.buffer.readBigUint64BE(this.offset);
+		const value = this.buffer.readBigUInt64BE(this.offset);
 		this.offset += 8;
 		return value;
 	}
@@ -53,7 +53,7 @@ export class ReaderBE extends ReaderBase implements IReader {
 		return value;
 	}
 
-	public readString() {
+	public readUString() {
 		const length = this.readUShort();
 		let text = "";
 
@@ -64,7 +64,18 @@ export class ReaderBE extends ReaderBase implements IReader {
 		return text;
 	}
 
-	public readString16() {
+	public readString() {
+		const length = this.readShort();
+		let text = "";
+
+		for (let i = 0; i < length; i++) {
+			text += String.fromCharCode(this.readByte());
+		}
+
+		return text;
+	}
+
+	public readUString16() {
 		const length = this.readUShort();
 		let text = "";
 
@@ -75,6 +86,17 @@ export class ReaderBE extends ReaderBase implements IReader {
 		return text;
 	}
 
+	public readString16() {
+		const length = this.readShort();
+		let text = "";
+
+		for (let i = 0; i < length; i++) {
+			text += String.fromCharCode(this.readUShort());
+		}
+
+		return text;
+	}
+
 	public readShortsAsString(shortsToRead:number) {
 		let text = "";
 

diff --git a/readers/ReaderLE.ts b/readers/ReaderLE.ts
@@ -36,7 +36,7 @@ export class ReaderLE extends ReaderBase implements IReader {
 	}
 
 	public readULong() {
-		const value = this.buffer.readBigUint64LE(this.offset);
+		const value = this.buffer.readBigUInt64LE(this.offset);
 		this.offset += 8;
 		return value;
 	}
@@ -53,7 +53,7 @@ export class ReaderLE extends ReaderBase implements IReader {
 		return value;
 	}
 
-	public readString() {
+	public readUString() {
 		const length = this.readUShort();
 		let text:string = "";
 
@@ -63,8 +63,19 @@ export class ReaderLE extends ReaderBase implements IReader {
 
 		return text;
 	}
+
+	public readString() {
+		const length = this.readShort();
+		let text:string = "";
+
+		for (let i = 0; i < length; i++) {
+			text += String.fromCharCode(this.readByte());
+		}
+
+		return text;
+	}
 
-	public readString16() {
+	public readUString16() {
 		const length = this.readUShort();
 		let text:string = "";
 
@@ -75,6 +86,17 @@ export class ReaderLE extends ReaderBase implements IReader {
 		return text;
 	}
 
+	public readString16() {
+		const length = this.readShort();
+		let text:string = "";
+
+		for (let i = 0; i < length; i++) {
+			text += String.fromCharCode(this.readShort());
+		}
+
+		return text;
+	}
+
 	public readShortsAsString(shortsToRead:number) {
 		let text = "";
 

diff --git a/writers/IWriter.ts b/writers/IWriter.ts
@@ -20,8 +20,12 @@ export interface IWriter {
 	writeULong(value:number|bigint): IWriter,
 	writeFloat(value:number): IWriter,
 	writeDouble(value:number): IWriter,
+	writeUShortString(text:string): IWriter,
 	writeShortString(text:string): IWriter,
+	writeUString(text:string): IWriter,
 	writeString(text:string): IWriter,
+	writeUString16(text:string): IWriter,
 	writeString16(text:string): IWriter,
-	writeStringAsShorts(text:string): IWriter
+	writeStringAsShorts(text:string): IWriter,
+	writeJavaUTF(text:string): IWriter
 }
diff --git a/writers/WriterBE.ts b/writers/WriterBE.ts
@@ -85,7 +85,7 @@ export class WriterBE extends WriterBase implements IWriter {
 			buffer.writeBigUint64BE(value);
 			this.writeBuffer(buffer);
 		} else {
-			this.buffer.writeBigUint64BE(value, this.offset);
+			this.buffer.writeBigUInt64BE(value, this.offset);
 			this.offset += 8;
 		}
 
@@ -118,8 +118,8 @@ export class WriterBE extends WriterBase implements IWriter {
 		return this;
 	}
 
-	public writeShortString(text:string) {
-		this.writeUByte(text.length);
+	public writeUString(text:string) {
+		this.writeUShort(text.length);
 
 		for (let i = 0; i < text.length; i++) {
 			this.writeUByte(text.charCodeAt(i));
@@ -129,16 +129,16 @@ export class WriterBE extends WriterBase implements IWriter {
 	}
 
 	public writeString(text:string) {
-		this.writeUShort(text.length);
+		this.writeShort(text.length);
 
 		for (let i = 0; i < text.length; i++) {
-			this.writeUByte(text.charCodeAt(i));
+			this.writeByte(text.charCodeAt(i));
 		}
 
 		return this;
 	}
 
-	public writeString16(text:string) {
+	public writeUString16(text:string) {
 		this.writeUShort(text.length);
 
 		for (let i = 0; i < text.length; i++) {
@@ -148,6 +148,16 @@ export class WriterBE extends WriterBase implements IWriter {
 		return this;
 	}
 
+	public writeString16(text:string) {
+		this.writeShort(text.length);
+
+		for (let i = 0; i < text.length; i++) {
+			this.writeShort(text.charCodeAt(i));
+		}
+
+		return this;
+	}
+
 	public writeStringAsShorts(text:string) {
 		let buffer:Buffer;
 		if (this.resizable) {
@@ -157,7 +167,23 @@ export class WriterBE extends WriterBase implements IWriter {
 		}
 
 		for (let i = 0; i < text.length; i++) {
-			buffer.writeUint16BE(text.charCodeAt(i), i);
+			buffer.writeUInt16BE(text.charCodeAt(i), i);
+		}
+
+		return this;
+	}
+
+	public writeJavaUTF(text: string) {
+		this.writeUShort(text.length);
+
+		for (let i = 0; i < text.length; i++) {
+			const val = text.charCodeAt(i);
+			if (val === 0) {
+				this.writeByte(0xC0);
+				this.writeByte(0X80);
+			} else {
+				this.writeByte(val);
+			}
 		}
 
 		return this;

diff --git a/writers/WriterLE.ts b/writers/WriterLE.ts
@@ -84,7 +84,7 @@ export class WriterLE extends WriterBase implements IWriter {
 			buffer.writeBigUint64LE(value);
 			this.writeBuffer(buffer);
 		} else {
-			this.buffer.writeBigUint64LE(value, this.offset);
+			this.buffer.writeBigUInt64LE(value, this.offset);
 			this.offset += 8;
 		}
 
@@ -117,8 +117,8 @@ export class WriterLE extends WriterBase implements IWriter {
 		return this;
 	}
 
-	public writeShortString(text:string) {
-		this.writeUByte(text.length);
+	public writeUString(text:string) {
+		this.writeUShort(text.length);
 
 		for (let i = 0; i < text.length; i++) {
 			this.writeUByte(text.charCodeAt(i));
@@ -128,16 +128,16 @@ export class WriterLE extends WriterBase implements IWriter {
 	}
 
 	public writeString(text:string) {
-		this.writeUShort(text.length);
+		this.writeShort(text.length);
 
 		for (let i = 0; i < text.length; i++) {
-			this.writeUByte(text.charCodeAt(i));
+			this.writeByte(text.charCodeAt(i));
 		}
 
 		return this;
 	}
 
-	public writeString16(text:string) {
+	public writeUString16(text:string) {
 		this.writeUShort(text.length);
 
 		for (let i = 0; i < text.length; i++) {
@@ -147,6 +147,16 @@ export class WriterLE extends WriterBase implements IWriter {
 		return this;
 	}
 
+	public writeString16(text:string) {
+		this.writeShort(text.length);
+
+		for (let i = 0; i < text.length; i++) {
+			this.writeShort(text.charCodeAt(i));
+		}
+
+		return this;
+	}
+
 	public writeStringAsShorts(text:string) {
 		let buffer:Buffer;
 		if (this.resizable) {
@@ -156,9 +166,15 @@ export class WriterLE extends WriterBase implements IWriter {
 		}
 
 		for (let i = 0; i < text.length; i++) {
-			buffer.writeUint16LE(text.charCodeAt(i), i);
+			buffer.writeUInt16LE(text.charCodeAt(i), i);
 		}
 
 		return this;
 	}
+
+	public writeJavaUTF(text: string) {
+		throw "Not implemented in Little-Endian Writer";
+
+		return this;
+	}
 }