@baltica/raknet 0.0.1 → 0.0.2

package/dist/client/client.d.ts

@@ -17,4 +17,5 @@ export declare class Client extends Emitter<ClientEvents> {
     connect(): Promise<void>;
     sendReliable(data: Buffer, priority?: Priority): void;
     close(): void;
+    disconnect(): void;
 }

package/dist/client/client.js

@@ -111,12 +111,36 @@ class Client extends utils_1.Emitter {
         this.network.frameAndSend(data, priority);
     }
     close() {
-        if (this.tickInterval)
+        if (this.tickInterval) {
             clearInterval(this.tickInterval);
-        if (this.relay)
-            this.relay.close();
-        else
-            this.socket.close();
+            this.tickInterval = undefined;
+        }
+        this.network.status = shared_1.Status.Disconnected;
+        this.network.send = () => { };
+        this.network.removeAllListeners();
+        try {
+            if (this.relay) {
+                this.relay.close();
+                this.relay = undefined;
+            }
+            else if (this.socket) {
+                this.socket.close();
+                this.socket = undefined;
+            }
+        }
+        catch { }
+    }
+    disconnect() {
+        const packet = new shared_1.Disconnect();
+        try {
+            this.sendReliable(packet.serialize(), shared_1.Priority.High);
+        }
+        catch { }
+        // Give UDP time to actually send the packet before closing
+        setTimeout(() => {
+            this.close();
+            this.emit("disconnect");
+        }, 150);
     }
 }
 exports.Client = Client;

package/dist/shared/network-session.js

@@ -221,6 +221,8 @@ class NetworkSession extends utils_1.Emitter {
         }
     }
     tick() {
+        if (this.status === proto_1.Status.Disconnected)
+            return;
         const now = Date.now();
         if (this.offlineRetry) {
             const r = this.offlineRetry;

package/dist/shared/socks5.js

@@ -43,17 +43,34 @@ async function createSocks5Relay(proxy, family = "udp4") {
         if (messageHandler)
             messageHandler(payload, addr, port);
     });
-    tcp.on("close", () => udp.close());
+    let closed = false;
+    tcp.on("close", () => {
+        if (closed)
+            return;
+        closed = true;
+        try {
+            udp.close();
+        }
+        catch { }
+    });
     return {
         socket: udp,
         tcp,
         send(data, targetAddress, targetPort) {
+            if (closed)
+                return;
             const header = buildUdpHeader(targetAddress, targetPort);
             const packet = Buffer.concat([header, data]);
             udp.send(packet, relay.port, relay.address);
         },
         close() {
-            udp.close();
+            if (closed)
+                return;
+            closed = true;
+            try {
+                udp.close();
+            }
+            catch { }
             tcp.destroy();
         },
         onMessage(handler) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@baltica/raknet",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "description": "RakNet implementation for Baltica",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",