diff --git a/packages/nethernet/package.json b/packages/nethernet/package.json index 60ac4f9..6ea6027 100644 --- a/packages/nethernet/package.json +++ b/packages/nethernet/package.json @@ -9,7 +9,6 @@ "@biomejs/biome": "^2.4.16", "@types/node": "^25.9.1", "fastify": "^5.8.5", - "node-gyp": "^12.3.0", - "wrtc": "^0.4.7" + "node-gyp": "^12.3.0" } } diff --git a/packages/nethernet/src/index.ts b/packages/nethernet/src/index.ts index 697d63c..6eddf68 100644 --- a/packages/nethernet/src/index.ts +++ b/packages/nethernet/src/index.ts @@ -24,20 +24,14 @@ socket.on("message", (buffer, rinfo) => { throw new Error("Packet is too short"); } - const decryptedData = decrypt(buffer.slice(32)); + const decryptedData = decrypt(buffer.subarray(32)); const checksum = calculateChecksum(decryptedData); - if (Buffer.compare(buffer.slice(0, 32), checksum) !== 0) { + if (Buffer.compare(buffer.subarray(0, 32), checksum) !== 0) { throw new Error("Checksum mismatch"); } - const [contentSize, packetType, senderId] = new ChaosPacketParser([ - PacketDataTypes.LU16, - PacketDataTypes.LU16, - PacketDataTypes.LI64, - ]).parse(decryptedData); - - console.log(packetType); + const [contentSize, packetType, senderId] = new ChaosPacketParser([PacketDataTypes.LU16, PacketDataTypes.LU16, PacketDataTypes.LU64]).parse(decryptedData); const serverData = new ChaosPacketBuilder() .pushByteU8(4) @@ -54,21 +48,15 @@ socket.on("message", (buffer, rinfo) => { .pushByteU8(CONNECTION_TYPE) .serialize(); - console.log(serverData); - console.log(serverData.toString()); - const discoveryResponseContent = new ChaosPacketBuilder() .pushShortLU16(PacketTypes.DiscoveryResponse) .pushLU64Long(senderId) - .pushBytes(Buffer.alloc(8)) + .pushBytes(Buffer.alloc(1)) .pushLU32(Buffer.byteLength(Buffer.from(serverData).toString("hex"))) .pushString(Buffer.from(serverData).toString("hex")) .serialize(); - const discoveryResponse = new ChaosPacketBuilder() - .pushShortLU16(discoveryResponseContent.byteLength) - .pushBytes(discoveryResponseContent) - .serialize(); + const discoveryResponse = new ChaosPacketBuilder().pushShortLU16(discoveryResponseContent.byteLength).pushBytes(discoveryResponseContent).serialize(); socket.send(encrypt(discoveryResponse), rinfo.port, rinfo.address); diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 590d1a1..e44d8c3 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -35,9 +35,6 @@ importers: node-gyp: specifier: ^12.3.0 version: 12.3.0 - wrtc: - specifier: ^0.4.7 - version: 0.4.7 packages/raknet: {} @@ -321,10 +318,6 @@ packages: resolution: {integrity: sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==} engines: {node: '>=6'} - domexception@1.0.1: - resolution: {integrity: sha512-raigMkn7CJNNo6Ihro1fzG7wr3fHuYVytzquZKX5n0yizGsTcYgzdIUwj1X9pK0VvjeihV+XiclP+DjwbsSKug==} - deprecated: Use your platform's native DOMException instead - env-paths@2.2.1: resolution: {integrity: sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==} engines: {node: '>=6'} @@ -526,20 +519,11 @@ packages: resolution: {integrity: sha512-4yqz8a3n5HmGTlsbADNtr/dJlhkh/55Rq798G6ibiULcXbDtaLpTl1pvdqcbFfeoj3iSi52lePFM7h9H21cw/A==} engines: {node: '>=18.17'} - webidl-conversions@4.0.2: - resolution: {integrity: sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==} - which@6.0.1: resolution: {integrity: sha512-oGLe46MIrCRqX7ytPUf66EAYvdeMIZYn3WaocqqKZAxrBpkqHfL/qvTyJ/bTk5+AqHCjXmrv3CEWgy368zhRUg==} engines: {node: ^20.17.0 || >=22.9.0} hasBin: true - wrtc@0.4.7: - resolution: {integrity: sha512-P6Hn7VT4lfSH49HxLHcHhDq+aFf/jd9dPY7lDHeFhZ22N3858EKuwm2jmnlPzpsRGEPaoF6XwkcxY5SYnt4f/g==} - engines: {node: ^8.11.2 || >=10.0.0} - bundledDependencies: - - node-pre-gyp - yallist@5.0.0: resolution: {integrity: sha512-YgvUTfwqyc7UXVMrB+SImsVYSmTS8X/tSrtdNZMImM+n7+QTriRXyXim0mBrTXNeqzVF0KWGgHPeiyViFFrNDw==} engines: {node: '>=18'} @@ -720,11 +704,6 @@ snapshots: dequal@2.0.3: {} - domexception@1.0.1: - dependencies: - webidl-conversions: 4.0.2 - optional: true - env-paths@2.2.1: {} esbuild@0.28.0: @@ -946,15 +925,8 @@ snapshots: undici@6.26.0: {} - webidl-conversions@4.0.2: - optional: true - which@6.0.1: dependencies: isexe: 4.0.0 - wrtc@0.4.7: - optionalDependencies: - domexception: 1.0.1 - yallist@5.0.0: {}