cache: netty-ize client and server
This commit is contained in:
@@ -29,6 +29,7 @@ import java.util.concurrent.CompletableFuture;
|
||||
import net.runelite.cache.CacheProperties;
|
||||
import net.runelite.cache.fs.Store;
|
||||
import net.runelite.cache.fs.tree.TreeStorage;
|
||||
import net.runelite.cache.protocol.packets.HandshakeResponseType;
|
||||
import org.junit.Assert;
|
||||
import org.junit.Before;
|
||||
import org.junit.Ignore;
|
||||
@@ -57,12 +58,12 @@ public class CacheClientTest
|
||||
|
||||
CacheClient c = new CacheClient(store, CacheProperties.getRsVersion());
|
||||
c.connect();
|
||||
CompletableFuture<Integer> handshake = c.handshake();
|
||||
CompletableFuture<HandshakeResponseType> handshake = c.handshake();
|
||||
|
||||
Integer result = handshake.get();
|
||||
HandshakeResponseType result = handshake.get();
|
||||
logger.info("Handshake result: {}", result);
|
||||
|
||||
Assert.assertEquals(0, (int) result);
|
||||
Assert.assertEquals(HandshakeResponseType.RESPONSE_OK, result);
|
||||
|
||||
c.download();
|
||||
|
||||
@@ -83,12 +84,12 @@ public class CacheClientTest
|
||||
|
||||
CacheClient c = new CacheClient(store, CacheProperties.getRsVersion());
|
||||
c.connect();
|
||||
CompletableFuture<Integer> handshake = c.handshake();
|
||||
CompletableFuture<HandshakeResponseType> handshake = c.handshake();
|
||||
|
||||
Integer result = handshake.get();
|
||||
HandshakeResponseType result = handshake.get();
|
||||
logger.info("Handshake result: {}", result);
|
||||
|
||||
Assert.assertEquals(0, (int) result);
|
||||
Assert.assertEquals(HandshakeResponseType.RESPONSE_OK, result);
|
||||
|
||||
c.download();
|
||||
|
||||
|
||||
74
cache/src/test/java/net/runelite/cache/protocol/encoders/ArchiveResponseEncoderTest.java
vendored
Normal file
74
cache/src/test/java/net/runelite/cache/protocol/encoders/ArchiveResponseEncoderTest.java
vendored
Normal file
@@ -0,0 +1,74 @@
|
||||
/*
|
||||
* Copyright (c) 2016-2017, Adam <Adam@sigterm.info>
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions are met:
|
||||
*
|
||||
* 1. Redistributions of source code must retain the above copyright notice, this
|
||||
* list of conditions and the following disclaimer.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright notice,
|
||||
* this list of conditions and the following disclaimer in the documentation
|
||||
* and/or other materials provided with the distribution.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
|
||||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
|
||||
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
||||
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
package net.runelite.cache.protocol.encoders;
|
||||
|
||||
import io.netty.buffer.ByteBuf;
|
||||
import io.netty.buffer.Unpooled;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Random;
|
||||
import net.runelite.cache.fs.jagex.CompressionType;
|
||||
import net.runelite.cache.fs.jagex.DataFile;
|
||||
import net.runelite.cache.protocol.decoders.ArchiveResponseDecoder;
|
||||
import net.runelite.cache.protocol.packets.ArchiveResponsePacket;
|
||||
import org.junit.Assert;
|
||||
import org.junit.Test;
|
||||
|
||||
public class ArchiveResponseEncoderTest
|
||||
{
|
||||
@Test
|
||||
public void testEncode() throws Exception
|
||||
{
|
||||
byte[] data = new byte[1000];
|
||||
Random random = new Random(42L);
|
||||
random.nextBytes(data);
|
||||
|
||||
byte[] compressedData = DataFile.compress(data, CompressionType.NONE, -1, null);
|
||||
|
||||
ArchiveResponsePacket archiveResponse = new ArchiveResponsePacket();
|
||||
archiveResponse.setIndex(0);
|
||||
archiveResponse.setArchive(1);
|
||||
archiveResponse.setData(compressedData);
|
||||
|
||||
ByteBuf buf = Unpooled.buffer(1024);
|
||||
ArchiveResponseEncoder encoder = new ArchiveResponseEncoder();
|
||||
encoder.encode(null, archiveResponse, buf);
|
||||
|
||||
ArchiveResponseDecoder decoder = new ArchiveResponseDecoder();
|
||||
List<Object> out = new ArrayList<>();
|
||||
decoder.decode(null, buf, out);
|
||||
|
||||
Assert.assertEquals(1, out.size());
|
||||
ArchiveResponsePacket response = (ArchiveResponsePacket) out.get(0);
|
||||
|
||||
Assert.assertEquals(archiveResponse.getIndex(), response.getIndex());
|
||||
Assert.assertEquals(archiveResponse.getArchive(), response.getArchive());
|
||||
Assert.assertArrayEquals(archiveResponse.getData(), response.getData());
|
||||
|
||||
byte[] decompressedData = DataFile.decompress(response.getData(), null).data;
|
||||
Assert.assertArrayEquals(data, decompressedData);
|
||||
}
|
||||
|
||||
}
|
||||
51
cache/src/test/java/net/runelite/cache/protocol/encoders/XorEncoderTest.java
vendored
Normal file
51
cache/src/test/java/net/runelite/cache/protocol/encoders/XorEncoderTest.java
vendored
Normal file
@@ -0,0 +1,51 @@
|
||||
/*
|
||||
* Copyright (c) 2016-2017, Adam <Adam@sigterm.info>
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions are met:
|
||||
*
|
||||
* 1. Redistributions of source code must retain the above copyright notice, this
|
||||
* list of conditions and the following disclaimer.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright notice,
|
||||
* this list of conditions and the following disclaimer in the documentation
|
||||
* and/or other materials provided with the distribution.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
|
||||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
|
||||
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
||||
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
package net.runelite.cache.protocol.encoders;
|
||||
|
||||
import io.netty.buffer.ByteBuf;
|
||||
import io.netty.buffer.Unpooled;
|
||||
import org.junit.Assert;
|
||||
import org.junit.Test;
|
||||
|
||||
public class XorEncoderTest
|
||||
{
|
||||
@Test
|
||||
public void testEncode() throws Exception
|
||||
{
|
||||
ByteBuf buf = Unpooled.buffer(1);
|
||||
buf.markWriterIndex();
|
||||
buf.writeByte(0xff);
|
||||
|
||||
XorEncoder encoder = new XorEncoder();
|
||||
encoder.setKey((byte) 0x1);
|
||||
|
||||
ByteBuf out = Unpooled.buffer(1);
|
||||
encoder.encode(null, buf, out);
|
||||
|
||||
byte encoded = out.readByte();
|
||||
Assert.assertEquals((Byte) (byte) 0xfe, (Byte) encoded);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -41,26 +41,11 @@ import org.junit.rules.TemporaryFolder;
|
||||
public class CacheServerTest
|
||||
{
|
||||
private static final String HOST = "localhost";
|
||||
private static final int REVISION = 139;
|
||||
private static final int REVISION = 154;
|
||||
|
||||
@Rule
|
||||
public TemporaryFolder folder = StoreLocation.getTemporaryFolder();
|
||||
|
||||
@Test
|
||||
@Ignore
|
||||
public void run() throws Exception
|
||||
{
|
||||
try (Store store = new Store(new File("D:\\rs\\07\\temp\\cache139"));
|
||||
CacheServer server = new CacheServer(store, REVISION))
|
||||
{
|
||||
store.load();
|
||||
store.rebuildCrc();
|
||||
|
||||
server.start();
|
||||
server.waitForClose();
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
@Ignore
|
||||
public void testDownload() throws Exception
|
||||
|
||||
Reference in New Issue
Block a user