bedrock-portal-nethernet 1.0.26 → 2.0.0

package/README.md

@@ -1,5 +1,5 @@
 # BedrockPortalNethernet
-[![NPM version](https://img.shields.io/npm/v/bedrock-portal.svg)](http://npmjs.com/package/bedrock-portal-nethernet)
+[![NPM version](https://img.shields.io/npm/v/bedrock-portal-nethernet.svg)](http://npmjs.com/package/bedrock-portal-nethernet)
 [![Discord](https://img.shields.io/badge/chat-on%20discord-brightgreen.svg)](https://discord.gg/KTyd9HWuBD)
 
 A simple server implementation for the Bedrock Edition Nethernet protocol used by [BedrockPortal](https://github.com/LucienHH/bedrock-portal). Join our [Discord](https://discord.com/invite/KTyd9HWuBD) for support.

package/dist/handshake/loginVerify.js

@@ -3,9 +3,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const crypto_1 = __importDefault(require("crypto"));
 const jsonwebtoken_1 = __importDefault(require("jsonwebtoken"));
 const constants_1 = require("./constants");
-const crypto_1 = __importDefault(require("crypto"));
 const debug = require('debug')('bedrock-portal-nethernet');
 exports.default = (client) => {
     // Refer to the docs:

package/dist/nethernet/connection.d.ts

@@ -1,17 +1,17 @@
+import { PeerConnection, DataChannel } from 'node-datachannel';
 import { Server } from './server';
-import { RTCDataChannel, RTCPeerConnection } from 'werift';
 export declare const maxMessageSize = 10000;
 export declare class Connection {
     nethernet: Server;
     connectionId: bigint;
-    rtcConnection: RTCPeerConnection;
-    reliable: RTCDataChannel | null;
-    unreliable: RTCDataChannel | null;
+    rtcConnection: PeerConnection;
+    reliable: DataChannel | null;
+    unreliable: DataChannel | null;
     promisedSegments: number;
     buf: Buffer | null;
-    constructor(nethernet: Server, connectionId: bigint, rtcConnection: RTCPeerConnection);
-    setChannels(reliable: RTCDataChannel | null, unreliable?: RTCDataChannel): void;
-    handleMessage(data: string | Buffer): void;
+    constructor(nethernet: Server, connectionId: bigint, rtcConnection: PeerConnection);
+    setChannels(reliable: DataChannel | null, unreliable?: DataChannel): void;
+    handleMessage(data: string | Buffer | ArrayBuffer): void;
     onPacket(packet: Buffer): void;
     write(data: string | Buffer): number;
     close(): void;

package/dist/nethernet/connection.js

@@ -23,7 +23,7 @@ class Connection {
     setChannels(reliable, unreliable) {
         if (reliable) {
             this.reliable = reliable;
-            this.reliable.onmessage = (msg) => this.handleMessage(msg.data);
+            this.reliable.onMessage((msg) => this.handleMessage(msg));
         }
         if (unreliable) {
             this.unreliable = unreliable;
@@ -33,6 +33,9 @@ class Connection {
         if (typeof data === 'string') {
             data = Buffer.from(data);
         }
+        if (data instanceof ArrayBuffer) {
+            data = Buffer.from(data);
+        }
         if (data.length < 2) {
             throw new Error('Unexpected EOF');
         }
@@ -70,7 +73,7 @@ class Connection {
             const frag = data.subarray(i, end);
             const message = Buffer.concat([Buffer.from([segments]), frag]);
             debugFn('Sending fragment', segments, 'header', message[0]);
-            this.reliable.send(message);
+            this.reliable.sendMessageBinary(message);
             n += frag.length;
         }
         if (segments !== 0) {

package/dist/nethernet/server.js

@@ -1,11 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Server = void 0;
-const werift_1 = require("werift");
+const node_datachannel_1 = require("node-datachannel");
 const connection_1 = require("./connection");
-const signal_1 = require("../signaling/signal");
 const struct_1 = require("../signaling/struct");
 const debugFn = require('debug')('bedrock-portal-nethernet');
+const getRandomUint64 = () => {
+    const high = Math.floor(Math.random() * 0xFFFFFFFF);
+    const low = Math.floor(Math.random() * 0xFFFFFFFF);
+    return (BigInt(high) << 32n) | BigInt(low);
+};
 class Server {
     networkId;
     connectionId;
@@ -14,7 +18,7 @@ class Server {
     onOpenConnection;
     onCloseConnection;
     onEncapsulated;
-    constructor(signaling, networkId = (0, signal_1.getRandomUint64)(), connectionId = (0, signal_1.getRandomUint64)()) {
+    constructor(signaling, networkId = getRandomUint64(), connectionId = getRandomUint64()) {
         this.signaling = signaling;
         this.networkId = networkId;
         this.connectionId = connectionId;
@@ -26,39 +30,39 @@ class Server {
     async handleCandidate(signal) {
         const conn = this.connections.get(signal.connectionId);
         if (conn) {
-            await conn.rtcConnection.addIceCandidate(new werift_1.RTCIceCandidate({ candidate: signal.data }));
+            conn.rtcConnection.addRemoteCandidate(signal.data, '0');
         }
         else {
             debugFn('Received candidate for unknown connection', signal);
         }
     }
     async handleOffer(signal) {
-        const rtcConnection = new werift_1.RTCPeerConnection({
-            iceServers: this.signaling.credentials,
-        });
+        if (!this.signaling.credentials) {
+            throw new Error('No credentials set');
+        }
+        const rtcConnection = new node_datachannel_1.PeerConnection('pc', { iceServers: this.signaling.credentials });
         const connection = new connection_1.Connection(this, signal.connectionId, rtcConnection);
         this.connections.set(signal.connectionId, connection);
-        rtcConnection.onicecandidate = (e) => {
-            if (e.candidate) {
-                this.signaling.write(new struct_1.SignalStructure(struct_1.SignalType.CandidateAdd, signal.connectionId, e.candidate.candidate, signal.networkId));
-            }
-        };
-        rtcConnection.ondatachannel = ({ channel }) => {
-            if (channel.label === 'ReliableDataChannel')
+        rtcConnection.onLocalCandidate(candidate => {
+            this.signaling.write(new struct_1.SignalStructure(struct_1.SignalType.CandidateAdd, signal.connectionId, candidate, signal.networkId));
+        });
+        rtcConnection.onDataChannel(channel => {
+            if (channel.getLabel() === 'ReliableDataChannel')
                 connection.setChannels(channel);
-            if (channel.label === 'UnreliableDataChannel')
+            if (channel.getLabel() === 'UnreliableDataChannel')
                 connection.setChannels(null, channel);
-        };
-        rtcConnection.onconnectionstatechange = () => {
-            const state = rtcConnection.connectionState;
+        });
+        rtcConnection.onIceStateChange(state => {
             if (state === 'connected')
                 this.onOpenConnection(connection);
             if (state === 'disconnected')
                 this.onCloseConnection(signal.connectionId, 'disconnected');
-        };
-        await rtcConnection.setRemoteDescription({ type: 'offer', sdp: signal.data });
-        const answer = await rtcConnection.createAnswer();
-        await rtcConnection.setLocalDescription(answer);
+        });
+        rtcConnection.setRemoteDescription(signal.data, 'offer');
+        const answer = rtcConnection.localDescription();
+        if (!answer) {
+            throw new Error('No answer');
+        }
         this.signaling.write(new struct_1.SignalStructure(struct_1.SignalType.ConnectResponse, signal.connectionId, answer.sdp, signal.networkId));
     }
     async listen() {

package/dist/options.d.ts

@@ -9,7 +9,7 @@ export type Options = {
     compressionThreshold: number;
     protocolVersion: number;
 };
-export declare const CURRENT_VERSION = "1.21.50";
+export declare const CURRENT_VERSION = "1.21.60";
 export declare const defaultOptions: {
     version: string;
     autoInitPlayer: boolean;

package/dist/options.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.defaultOptions = exports.CURRENT_VERSION = void 0;
 const framer_1 = require("./transforms/framer");
 // Currently supported verson. Note, clients with newer versions can still connect as long as data is in minecraft-data
-exports.CURRENT_VERSION = '1.21.50';
+exports.CURRENT_VERSION = '1.21.60';
 exports.defaultOptions = {
     // https://minecraft.wiki/w/Protocol_version#Bedrock_Edition_2
     version: exports.CURRENT_VERSION,

package/dist/serverPlayer.js

@@ -248,7 +248,7 @@ class Player extends tiny_typed_emitter_1.TypedEmitter {
         this.sendPacket(batch.encode());
     }
     sendPacket(buffer) {
-        if (this.connection.reliable?.readyState !== 'open' || this.status === exports.ClientStatus.Disconnected)
+        if (!this.connection.reliable?.isOpen() || this.status === exports.ClientStatus.Disconnected)
             return;
         try {
             this.connection.write(buffer);

package/dist/signaling/signal.d.ts

@@ -1,15 +1,20 @@
 import type { Authflow } from 'prismarine-auth';
+import { EventEmitter } from 'events';
 import { Data, ErrorEvent, WebSocket } from 'ws';
 import { SignalStructure } from './struct';
-import { EventEmitter } from 'events';
-export declare function getRandomUint64(): bigint;
 export declare class Signal extends EventEmitter {
-    authflow: Authflow;
     ws: WebSocket | null;
-    pingInterval: NodeJS.Timeout | null;
     networkId: bigint;
-    version: string;
-    credentials: any;
+    credentials: {
+        hostname: string;
+        port: number;
+        username: string;
+        password: string;
+    }[] | null;
+    private authflow;
+    private version;
+    private pingInterval;
+    private retryCount;
     constructor(authflow: Authflow, networkId: bigint, version: string);
     connect(): Promise<void>;
     destroy(resume?: boolean): Promise<void>;

package/dist/signaling/signal.js

@@ -4,41 +4,34 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Signal = void 0;
-exports.getRandomUint64 = getRandomUint64;
 const debug_1 = __importDefault(require("debug"));
+const json_bigint_1 = require("json-bigint");
+const events_1 = require("events");
 const ws_1 = require("ws");
 const struct_1 = require("./struct");
-const events_1 = require("events");
-const json_bigint_1 = require("json-bigint");
 const MessageType = {
     RequestPing: 0,
     Signal: 1,
     Credentials: 2,
 };
 const debug = (0, debug_1.default)('bedrock-portal-nethernet');
-function getRandomUint64() {
-    // Generate two 32-bit random integers
-    const high = Math.floor(Math.random() * 0xFFFFFFFF);
-    const low = Math.floor(Math.random() * 0xFFFFFFFF);
-    // Combine them to create a 64-bit unsigned integer
-    const result = (BigInt(high) << 32n) | BigInt(low);
-    return result;
-}
 class Signal extends events_1.EventEmitter {
-    authflow;
     ws;
-    pingInterval;
     networkId;
-    version;
     credentials;
+    authflow;
+    version;
+    pingInterval;
+    retryCount;
     constructor(authflow, networkId, version) {
         super();
         this.authflow = authflow;
         this.networkId = networkId;
         this.version = version;
         this.ws = null;
-        this.pingInterval = null;
         this.credentials = null;
+        this.pingInterval = null;
+        this.retryCount = 0;
     }
     async connect() {
         if (this.ws?.readyState === ws_1.WebSocket.OPEN)
@@ -83,7 +76,7 @@ class Signal extends events_1.EventEmitter {
             if (this.ws && this.ws.readyState === ws_1.WebSocket.OPEN) {
                 this.ws.send(JSON.stringify({ Type: MessageType.RequestPing }));
             }
-        });
+        }, 5000);
         ws.onopen = () => {
             this.onOpen();
         };
@@ -108,7 +101,14 @@ class Signal extends events_1.EventEmitter {
         debug(`Signal Disconnected with code ${code} and reason ${reason}`);
         if (code === 1006) {
             debug('Signal Connection Closed Unexpectedly');
-            this.destroy(true);
+            if (this.retryCount < 5) {
+                this.retryCount++;
+                this.destroy(true);
+            }
+            else {
+                this.destroy();
+                throw new Error('Signal Connection Closed Unexpectedly');
+            }
         }
     }
     onMessage(res) {
@@ -122,13 +122,7 @@ class Signal extends events_1.EventEmitter {
                     debug('received credentials from non-Server', 'message', message);
                     return;
                 }
-                this.credentials = JSON.parse(message.Message).TurnAuthServers.map((credential) => {
-                    return {
-                        urls: credential.Urls.join(','),
-                        credential: credential.Password,
-                        username: credential.Username,
-                    };
-                });
+                this.credentials = parseTurnServers(message.Message);
                 this.emit('credentials', this.credentials);
                 break;
             }
@@ -151,3 +145,25 @@ class Signal extends events_1.EventEmitter {
     }
 }
 exports.Signal = Signal;
+function parseTurnServers(dataString) {
+    const servers = [];
+    const data = JSON.parse(dataString);
+    if (!data.TurnAuthServers)
+        return servers;
+    for (const server of data.TurnAuthServers) {
+        if (!server.Urls)
+            continue;
+        for (const url of server.Urls) {
+            const match = url.match(/(stun|turn):([^:]+):(\d+)/);
+            if (match) {
+                servers.push({
+                    hostname: match[2],
+                    port: parseInt(match[3], 10),
+                    username: server.Username || undefined,
+                    password: server.Password || undefined,
+                });
+            }
+        }
+    }
+    return servers;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bedrock-portal-nethernet",
-  "version": "1.0.26",
+  "version": "2.0.0",
   "description": "A simple server implementation for the Bedrock Edition Nethernet protocol",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -15,23 +15,19 @@
     "debug": "^4.3.4",
     "json-bigint": "^1.0.0",
     "jsonwebtoken": "^9.0.0",
+    "node-datachannel": "^0.25.0",
     "prismarine-auth": "github:LucienHH/prismarine-auth#playfab",
     "prismarine-nbt": "^2.0.0",
     "protodef": "^1.14.0",
-    "sdp-transform": "^2.14.2",
     "tiny-typed-emitter": "^2.1.0",
     "uuid-1345": "^1.0.2",
-    "werift": "^0.19.9",
     "ws": "^8.18.0"
   },
   "devDependencies": {
     "@types/debug": "^4.1.12",
     "@types/json-bigint": "^1.0.4",
     "@types/jsonwebtoken": "^9.0.6",
-    "@types/multicast-dns": "^7.2.4",
     "@types/node": "^20.10.6",
-    "@types/sdp-transform": "^2.4.9",
-    "@types/uuid": "^9.0.8",
     "@types/uuid-1345": "^0.99.25",
     "@types/ws": "^8.5.12",
     "@typescript-eslint/eslint-plugin": "^6.17.0",