replace NodeJS buffer with Uint8Array

This commit is contained in:
2024-10-23 16:38:16 -05:00
parent 90e1bd09a0
commit 4eaedcdfaa
34 changed files with 235 additions and 113 deletions
+10 -5
View File
@@ -1,4 +1,4 @@
export default (id: number, chunkData: Buffer, hasSubchunks: boolean): Buffer => {
export default (id: number, chunkData: Uint8Array, hasSubchunks: boolean): Uint8Array => {
if (!Number.isInteger(id)) {
throw new Error('chunk id must be an integer');
}
@@ -11,10 +11,15 @@ export default (id: number, chunkData: Buffer, hasSubchunks: boolean): Buffer =>
throw new Error('chunkData can not be greater than 32767 bytes');
}
const header = Buffer.alloc(4);
header.writeUInt16LE(id);
const header = new DataView(new ArrayBuffer(4));
header.setUint16(0, id, true);
const hasSubChunksBit = (hasSubchunks ? 1 : 0) << 15;
header.writeUInt16LE(hasSubChunksBit + chunkData.length, 2);
header.setUint16(2, hasSubChunksBit + chunkData.length, true);
return Buffer.concat([header, chunkData]);
const headerBytes = new Uint8Array(header.buffer);
const bytes = new Uint8Array(headerBytes.length + chunkData.length);
bytes.set(headerBytes);
bytes.set(chunkData, headerBytes.length);
return bytes;
};
+6 -2
View File
@@ -1,3 +1,7 @@
import chunk from '../chunk';
export default (packetHeaderChunk: Buffer, trackerListChunk: Buffer): Buffer =>
chunk(0x6755, Buffer.concat([packetHeaderChunk, trackerListChunk]), true);
export default (packetHeaderChunk: Uint8Array, trackerListChunk: Uint8Array): Uint8Array => {
const chunkData = new Uint8Array(packetHeaderChunk.length + trackerListChunk.length);
chunkData.set(packetHeaderChunk);
chunkData.set(trackerListChunk, packetHeaderChunk.length);
return chunk(0x6755, chunkData, true);
};
@@ -1,9 +1,9 @@
import chunk from '../chunk';
export default (x: number, y: number, z: number): Buffer => {
const buf = Buffer.alloc(12);
buf.writeFloatLE(x);
buf.writeFloatLE(y, 4);
buf.writeFloatLE(z, 8);
return chunk(0x0004, buf, false);
export default (x: number, y: number, z: number): Uint8Array => {
const buf = new DataView(new ArrayBuffer(12));
buf.setFloat32(0, x, true);
buf.setFloat32(4, y, true);
buf.setFloat32(8, z, true);
return chunk(0x0004, new Uint8Array(buf.buffer), false);
};
+18 -2
View File
@@ -1,4 +1,20 @@
import chunk from '../chunk';
export default (trackerId: number, fieldChunks: Buffer[]): Buffer =>
chunk(trackerId, Buffer.concat(fieldChunks), fieldChunks.length > 0);
export default (trackerId: number, fieldChunks: Uint8Array[]): Uint8Array => {
let fieldChunksTotalLength = 0;
fieldChunks.forEach((fieldChunk) => {
fieldChunksTotalLength += fieldChunk.length;
});
const fieldChunksBytes = new Uint8Array(fieldChunksTotalLength);
let offset = 0;
fieldChunks.forEach((fieldChunk) => {
fieldChunksBytes.set(fieldChunk, offset);
offset += fieldChunk.length;
});
return chunk(trackerId, fieldChunksBytes, fieldChunks.length > 0);
};
+18 -1
View File
@@ -1,3 +1,20 @@
import chunk from '../chunk';
export default (trackerChunks: Buffer[]) => chunk(0x0001, Buffer.concat(trackerChunks), true);
export default (trackerChunks: Uint8Array[]) => {
let trackerChunksTotalLength = 0;
trackerChunks.forEach((trackerChunk) => {
trackerChunksTotalLength += trackerChunk.length;
});
const trackerChunksBytes = new Uint8Array(trackerChunksTotalLength);
let offset = 0;
trackerChunks.forEach((trackerChunk) => {
trackerChunksBytes.set(trackerChunk, offset);
offset += trackerChunk.length;
});
return chunk(0x0001, trackerChunksBytes, true);
};
+7 -6
View File
@@ -1,9 +1,10 @@
import chunk from '../chunk';
export default (x: number, y: number, z: number): Buffer => {
const buf = Buffer.alloc(12);
buf.writeFloatLE(x);
buf.writeFloatLE(y, 4);
buf.writeFloatLE(z, 8);
return chunk(0x0002, buf, false);
export default (x: number, y: number, z: number): Uint8Array => {
const buf = new DataView(new ArrayBuffer(12));
buf.setFloat32(0, x, true);
buf.setFloat32(4, y, true);
buf.setFloat32(8, z, true);
return chunk(0x0002, new Uint8Array(buf.buffer), false);
};
+8 -6
View File
@@ -1,9 +1,11 @@
import chunk from '../chunk';
export default (x: number, y: number, z: number): Buffer => {
const buf = Buffer.alloc(12);
buf.writeFloatLE(x);
buf.writeFloatLE(y, 4);
buf.writeFloatLE(z, 8);
return chunk(0x0000, buf, false);
export default (x: number, y: number, z: number): Uint8Array => {
const buf = new DataView(new ArrayBuffer(12));
buf.setFloat32(0, x, true);
buf.setFloat32(4, y, true);
buf.setFloat32(8, z, true);
return chunk(0x0000, new Uint8Array(buf.buffer), false);
};
@@ -1,9 +1,11 @@
import chunk from '../chunk';
export default (x: number, y: number, z: number): Buffer => {
const buf = Buffer.alloc(12);
buf.writeFloatLE(x);
buf.writeFloatLE(y, 4);
buf.writeFloatLE(z, 8);
return chunk(0x0001, buf, false);
export default (x: number, y: number, z: number): Uint8Array => {
const buf = new DataView(new ArrayBuffer(12));
buf.setFloat32(0, x, true);
buf.setFloat32(4, y, true);
buf.setFloat32(8, z, true);
return chunk(0x0001, new Uint8Array(buf.buffer), false);
};
@@ -1,7 +1,7 @@
import chunk from '../chunk';
export default (validity: number): Buffer => {
const buf = Buffer.alloc(4);
buf.writeFloatLE(validity);
return chunk(0x0003, buf, false);
export default (validity: number): Uint8Array => {
const buf = new DataView(new ArrayBuffer(4));
buf.setFloat32(0, validity, true);
return chunk(0x0003, new Uint8Array(buf.buffer), false);
};
@@ -1,7 +1,7 @@
import chunk from '../chunk';
export default (timestamp: bigint): Buffer => {
const buf = Buffer.alloc(8);
buf.writeBigUInt64LE(BigInt(timestamp));
return chunk(0x0006, buf, false);
export default (timestamp: bigint): Uint8Array => {
const buf = new DataView(new ArrayBuffer(8));
buf.setBigUint64(0, BigInt(timestamp), true);
return chunk(0x0006, new Uint8Array(buf.buffer), false);
};
@@ -1,9 +1,11 @@
import chunk from '../chunk';
export default (x: number, y: number, z: number): Buffer => {
const buf = Buffer.alloc(12);
buf.writeFloatLE(x);
buf.writeFloatLE(y, 4);
buf.writeFloatLE(z, 8);
return chunk(0x0005, buf, false);
export default (x: number, y: number, z: number): Uint8Array => {
const buf = new DataView(new ArrayBuffer(12));
buf.setFloat32(0, x, true);
buf.setFloat32(4, y, true);
buf.setFloat32(8, z, true);
return chunk(0x0005, new Uint8Array(buf.buffer), false);
};
+12 -2
View File
@@ -1,4 +1,14 @@
import chunk from '../chunk';
export default (packetHeaderChunk: Buffer, systemNameChunk: Buffer, trackerListChunk: Buffer): Buffer =>
chunk(0x6756, Buffer.concat([packetHeaderChunk, systemNameChunk, trackerListChunk]), true);
export default (
packetHeaderChunk: Uint8Array,
systemNameChunk: Uint8Array,
trackerListChunk: Uint8Array
): Uint8Array => {
const chunkData = new Uint8Array(packetHeaderChunk.length + systemNameChunk.length + trackerListChunk.length);
chunkData.set(packetHeaderChunk);
chunkData.set(systemNameChunk, packetHeaderChunk.length);
chunkData.set(trackerListChunk, packetHeaderChunk.length + systemNameChunk.length);
return chunk(0x6756, chunkData, true);
};
+1 -1
View File
@@ -1,3 +1,3 @@
import chunk from '../chunk';
export default (systemName: string): Buffer => chunk(0x0001, Buffer.from(systemName), false);
export default (systemName: string): Uint8Array => chunk(0x0001, new TextEncoder().encode(systemName), false);
+2 -1
View File
@@ -1,3 +1,4 @@
import chunk from '../chunk';
export default (trackerId: number, trackerNameChunk: Buffer): Buffer => chunk(trackerId, trackerNameChunk, true);
export default (trackerId: number, trackerNameChunk: Uint8Array): Uint8Array =>
chunk(trackerId, trackerNameChunk, true);
+17 -1
View File
@@ -1,3 +1,19 @@
import chunk from '../chunk';
export default (trackerChunks: Buffer[]): Buffer => chunk(0x0002, Buffer.concat(trackerChunks), true);
export default (trackerChunks: Uint8Array[]): Uint8Array => {
let trackerChunksTotalLength = 0;
trackerChunks.forEach((trackerChunk) => {
trackerChunksTotalLength += trackerChunk.length;
});
const trackerChunksBytes = new Uint8Array(trackerChunksTotalLength);
let offset = 0;
trackerChunks.forEach((trackerChunk) => {
trackerChunksBytes.set(trackerChunk, offset);
offset += trackerChunk.length;
});
return chunk(0x0002, trackerChunksBytes, true);
};
+1 -1
View File
@@ -1,3 +1,3 @@
import chunk from '../chunk';
export default (trackerName: string) => chunk(0x0000, Buffer.from(trackerName), false);
export default (trackerName: string) => chunk(0x0000, new TextEncoder().encode(trackerName), false);
+8 -8
View File
@@ -6,7 +6,7 @@ export default (
versionLow: number,
frameId: number,
framePacketCount: number
): Buffer => {
): Uint8Array => {
if (!Number.isInteger(versionHigh)) {
throw new Error('version high must be an integer');
}
@@ -33,12 +33,12 @@ export default (
throw new Error('frame packet count must be >= 0 and <= 255');
}
const packetHeader = Buffer.alloc(12);
packetHeader.writeBigUInt64LE(BigInt(timestamp));
packetHeader.writeUint8(versionHigh, 8);
packetHeader.writeUint8(versionLow, 9);
packetHeader.writeUint8(frameId, 10);
packetHeader.writeUint8(framePacketCount, 11);
const packetHeader = new DataView(new ArrayBuffer(12));
packetHeader.setBigUint64(0, BigInt(timestamp), true);
packetHeader.setUint8(8, versionHigh);
packetHeader.setUint8(9, versionLow);
packetHeader.setUint8(10, frameId);
packetHeader.setUint8(11, framePacketCount);
return chunk(0x0000, packetHeader, false);
return chunk(0x0000, new Uint8Array(packetHeader.buffer), false);
};