update to v1.0.6

update README.md update build.gradle add ClientDisconnectPacket.java

Author: mint9976

README.md

@@ -2,7 +2,7 @@
 <a href="https://zyonicsoftware.com"> <img src="https://i.postimg.cc/HnjVQNdQ/signal.png" /></a>
 <h2>A library for java with the native java socket technology and in combination with the custom bytebuffer allocator technology by boonproject</h2>
  <hr />
- <a href="https://gitlab.zyonicsoftware.com/mint9976/Signal/-/packages"><img src="https://img.shields.io/badge/release-v1.0.5-9cf" /></a>
+ <a href="https://gitlab.zyonicsoftware.com/mint9976/Signal/-/packages"><img src="https://img.shields.io/badge/release-v1.0.6-9cf" /></a>
  <a href="https://github.com/mintUI9976/Signal"><img src="https://img.shields.io/github/languages/code-size/mintUI9976/Signal?color=orange" /></a>
  <a href="https://github.com/mintUI9976/Signal"><img src="https://img.shields.io/tokei/lines/github/mintUI9976/Signal?color=yellow" /></a>
  <a href="https://github.com/mintUI9976/Signal/blob/master/LICENSE"><img src="https://img.shields.io/github/license/mintUI9976/Signal" /></a>
@@ -62,7 +62,7 @@ maven{url"https://gitlab.zyonicsoftware.com/api/v4/projects/144/packages/maven"}
 ````
 
 ````xml
-compile group:'com.zyonicsoftware.minereaper.signal',name:'Signal',version:'v1.0.5'
+compile group:'com.zyonicsoftware.minereaper.signal',name:'Signal',version:'v1.0.6'
 ````
 
 <hr />
@@ -74,12 +74,12 @@ compile group:'com.zyonicsoftware.minereaper.signal',name:'Signal',version:'v1.0
 <dependency>
  <groupId>com.zyonicsoftware.minereaper.signal</groupId>
  <artifactId>Signal</artifactId>
- <version>v1.0.5</version>
+ <version>v1.0.6</version>
 </dependency>
 ````
 
 ````xml
-mvn dependency:get -Dartifact=com.zyonicsoftware.minereaper.signal:Signal:v1.0.5
+mvn dependency:get -Dartifact=com.zyonicsoftware.minereaper.signal:Signal:v1.0.6
 ````
 
 ````xml

build.gradle

@@ -7,7 +7,7 @@ plugins {
 apply plugin: 'maven'
 
 group 'com.zyonicsoftware.minereaper.signal'
-version 'v1.0.5'
+version 'v1.0.6'
 
 tasks.withType(JavaCompile) {
  options.encoding = 'UTF-8'

src/main/java/com/zyonicsoftware/minereaper/signal/client/Client.java

@@ -21,6 +21,7 @@
 import com.zyonicsoftware.minereaper.signal.keepalive.KeepAliveThread;
 import com.zyonicsoftware.minereaper.signal.outgoing.OutputStreamThread;
 import com.zyonicsoftware.minereaper.signal.packet.Packet;
+import com.zyonicsoftware.minereaper.signal.packet.ahead.ClientDisconnectPacket;
 import com.zyonicsoftware.minereaper.signal.scheduler.RedEugeneScheduler;
 import com.zyonicsoftware.minereaper.signal.signal.SignalProvider;
 import org.jetbrains.annotations.NotNull;
@@ -172,7 +173,9 @@ public void connect() throws IOException {
  public void disconnect() throws IOException {
  // interrupt the keep alive thread
  this.disconnected = true;
+
  if (Allocator.getAllocation().equals(Allocation.CLIENT_SIDE)) {
+ this.send(new ClientDisconnectPacket());
  this.keepAliveThread.interrupt();
  }
 

src/main/java/com/zyonicsoftware/minereaper/signal/incoming/InputStreamThread.java

@@ -71,9 +71,7 @@ public void run() {
  try {
  if (this.socket.isClosed()) {
  // interrupt thread
- if (!this.client.isDisconnected()) {
- this.client.disconnect();
- }
+ this.interrupt();
  return;
  }
  // check if finalInputStream is null
@@ -106,6 +104,12 @@ public void run() {
  this.resetCalculation();
  this.receiveIncomingPacketMessage(
  KeepAlivePacket.class.getName(), connectionUUID.toString());
+ } else if (packetId == -4) {
+ final UUID connectionUUID = readingByteBuffer.readUUID();
+ this.resetCalculation();
+ this.receiveIncomingPacketMessage(
+ KeepAlivePacket.class.getName(), connectionUUID.toString());
+ this.client.disconnect();
  } else {
  // get packet
  final Class<? extends Packet> packet = PacketRegistry.get(packetId);

src/main/java/com/zyonicsoftware/minereaper/signal/keepalive/KeepAliveThread.java

@@ -18,7 +18,6 @@
 import com.zyonicsoftware.minereaper.signal.signal.SignalProvider;
 import org.jetbrains.annotations.NotNull;
 
-import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
 import java.net.Socket;
 import java.util.concurrent.TimeUnit;
@@ -51,13 +50,7 @@ public void run() {
  super.run();
  if (this.socket.isClosed()) {
  // interrupt thread
- if (!this.client.isDisconnected()) {
- try {
- this.client.disconnect();
- } catch (final IOException exception) {
- exception.printStackTrace();
- }
- }
+ this.interrupt();
  return;
  }
  this.client.send(new KeepAlivePacket());

src/main/java/com/zyonicsoftware/minereaper/signal/outgoing/OutputStreamThread.java

@@ -17,6 +17,7 @@
 import com.zyonicsoftware.minereaper.signal.exception.SignalException;
 import com.zyonicsoftware.minereaper.signal.packet.Packet;
 import com.zyonicsoftware.minereaper.signal.packet.PacketRegistry;
+import com.zyonicsoftware.minereaper.signal.packet.ahead.ClientDisconnectPacket;
 import com.zyonicsoftware.minereaper.signal.packet.ahead.KeepAlivePacket;
 import com.zyonicsoftware.minereaper.signal.packet.ahead.UpdateUUIDPacket;
 import com.zyonicsoftware.minereaper.signal.scheduler.RedEugeneScheduler;
@@ -70,9 +71,7 @@ public void run() {
  try {
  if (this.socket.isClosed()) {
  // interrupt thread
- if (!this.client.isDisconnected()) {
- this.client.disconnect();
- }
+ this.interrupt();
  return;
  }
  // skip when input stream is null
@@ -93,6 +92,9 @@ public void run() {
  } else if (packet.getClass().equals(KeepAlivePacket.class)) {
  writingByteBuffer.writeInt(-3);
  writingByteBuffer.writeUUID(this.client.getConnectionUUID().get());
+ } else if (packet.getClass().equals(ClientDisconnectPacket.class)) {
+ writingByteBuffer.writeInt(-4);
+ writingByteBuffer.writeUUID(this.client.getConnectionUUID().get());
  } else {
  // get packetId
  final int packetId = PacketRegistry.indexOf(packet.getClass());

src/main/java/com/zyonicsoftware/minereaper/signal/packet/ahead/ClientDisconnectPacket.java

@@ -0,0 +1,33 @@
+/*
+ *
+ * * Copyright (c) 2021. Zyonic Software - Niklas Griese
+ * * This File, its contents and by extention the corresponding project is property of Zyonic Software and may not be used without explicit permission to do so.
+ * *
+ * * contact(at)zyonicsoftware.com
+ *
+ */
+
+package com.zyonicsoftware.minereaper.signal.packet.ahead;
+
+import com.zyonicsoftware.minereaper.signal.buffer.ReadingByteBuffer;
+import com.zyonicsoftware.minereaper.signal.buffer.WritingByteBuffer;
+import com.zyonicsoftware.minereaper.signal.packet.Packet;
+
+import java.util.UUID;
+
+public class ClientDisconnectPacket extends Packet {
+
+ public ClientDisconnectPacket(final UUID connectionUUID) {
+ super(connectionUUID);
+ }
+
+ public ClientDisconnectPacket() {
+ super(null);
+ }
+
+ @Override
+ public void send(final WritingByteBuffer writingByteBuffer) {}
+
+ @Override
+ public void receive(final ReadingByteBuffer readingByteBuffer) {}
+}