This repository has been archived by the owner on Aug 13, 2019. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
cache: split cache client and server into their own projects
Split handshake and update protocol also into their own projects
- Loading branch information
0 parents
commit bec143d
Showing
8 changed files
with
729 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,87 @@ | ||
<?xml version="1.0" encoding="UTF-8"?> | ||
<!-- | ||
Copyright (c) 2016-2017, Adam <[email protected]> | ||
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. | ||
--> | ||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> | ||
<modelVersion>4.0.0</modelVersion> | ||
|
||
<parent> | ||
<groupId>net.runelite</groupId> | ||
<artifactId>runelite-parent</artifactId> | ||
<version>1.2.11-SNAPSHOT</version> | ||
</parent> | ||
|
||
<groupId>net.runelite</groupId> | ||
<artifactId>cache-server</artifactId> | ||
<name>Cache Server</name> | ||
|
||
<properties> | ||
<cache.version>160</cache.version> | ||
</properties> | ||
|
||
<dependencies> | ||
<dependency> | ||
<groupId>net.runelite</groupId> | ||
<artifactId>cache</artifactId> | ||
<version>${project.version}</version> | ||
</dependency> | ||
<dependency> | ||
<groupId>net.runelite</groupId> | ||
<artifactId>protocol</artifactId> | ||
<version>${project.version}</version> | ||
</dependency> | ||
|
||
<dependency> | ||
<groupId>junit</groupId> | ||
<artifactId>junit</artifactId> | ||
<version>4.12</version> | ||
<scope>test</scope> | ||
</dependency> | ||
<dependency> | ||
<groupId>org.slf4j</groupId> | ||
<artifactId>slf4j-simple</artifactId> | ||
<version>1.7.12</version> | ||
<scope>test</scope> | ||
</dependency> | ||
<dependency> | ||
<groupId>net.runelite</groupId> | ||
<artifactId>cache</artifactId> | ||
<version>${project.version}</version> | ||
<type>test-jar</type> | ||
<scope>test</scope> | ||
</dependency> | ||
<dependency> | ||
<groupId>net.runelite.rs</groupId> | ||
<artifactId>cache</artifactId> | ||
<version>${cache.version}</version> | ||
<scope>test</scope> | ||
</dependency> | ||
<dependency> | ||
<groupId>net.runelite</groupId> | ||
<artifactId>cache-client</artifactId> | ||
<version>${project.version}</version> | ||
<scope>test</scope> | ||
</dependency> | ||
</dependencies> | ||
</project> |
158 changes: 158 additions & 0 deletions
158
src/main/java/net/runelite/cache/server/ArchiveRequestHandler.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,158 @@ | ||
/* | ||
* Copyright (c) 2016-2017, Adam <[email protected]> | ||
* 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.server; | ||
|
||
import com.google.common.primitives.Ints; | ||
import io.netty.buffer.ByteBuf; | ||
import io.netty.channel.ChannelHandlerContext; | ||
import io.netty.channel.SimpleChannelInboundHandler; | ||
import java.io.IOException; | ||
import java.util.Arrays; | ||
import net.runelite.cache.fs.Archive; | ||
import net.runelite.cache.fs.Container; | ||
import net.runelite.cache.fs.Index; | ||
import net.runelite.cache.fs.Storage; | ||
import net.runelite.cache.fs.Store; | ||
import net.runelite.cache.fs.jagex.CompressionType; | ||
import net.runelite.cache.fs.jagex.DiskStorage; | ||
import net.runelite.protocol.api.update.ArchiveRequestPacket; | ||
import net.runelite.protocol.api.update.ArchiveResponsePacket; | ||
import org.slf4j.Logger; | ||
import org.slf4j.LoggerFactory; | ||
|
||
public class ArchiveRequestHandler extends SimpleChannelInboundHandler<ArchiveRequestPacket> | ||
{ | ||
private static final Logger logger = LoggerFactory.getLogger(ArchiveRequestHandler.class); | ||
|
||
private final Store store; | ||
|
||
public ArchiveRequestHandler(Store store) | ||
{ | ||
this.store = store; | ||
} | ||
|
||
@Override | ||
protected void channelRead0(ChannelHandlerContext ctx, ArchiveRequestPacket archiveRequest) throws Exception | ||
{ | ||
if (archiveRequest.getIndex() == 255) | ||
{ | ||
handleRequest255(ctx, archiveRequest.getIndex(), | ||
archiveRequest.getArchive()); | ||
} | ||
else | ||
{ | ||
handleRequest(ctx, archiveRequest.getIndex(), | ||
archiveRequest.getArchive()); | ||
} | ||
} | ||
|
||
private void handleRequest255(ChannelHandlerContext ctx, int index, int archiveId) throws IOException | ||
{ | ||
logger.info("Client {} requests 255: index {}, archive {}", ctx.channel().remoteAddress(), index, archiveId); | ||
|
||
byte[] compressed; | ||
if (archiveId == 255) | ||
{ | ||
// index 255 data, for each index: | ||
// 4 byte crc | ||
// 4 byte revision | ||
ByteBuf buffer = ctx.alloc().heapBuffer(store.getIndexes().size() * 8); | ||
for (Index i : store.getIndexes()) | ||
{ | ||
buffer.writeInt(i.getCrc()); | ||
buffer.writeInt(i.getRevision()); | ||
} | ||
|
||
compressed = compress(CompressionType.NONE, Arrays.copyOf(buffer.array(), buffer.readableBytes())); | ||
buffer.release(); | ||
} | ||
else | ||
{ | ||
// Requires disk storage. Use packed index data from | ||
// store as its crc matches | ||
DiskStorage storage = (DiskStorage) store.getStorage(); | ||
compressed = storage.readIndex(archiveId); | ||
} | ||
|
||
ArchiveResponsePacket response = new ArchiveResponsePacket(); | ||
response.setIndex(index); | ||
response.setArchive(archiveId); | ||
response.setData(compressed); | ||
|
||
ctx.writeAndFlush(response); | ||
} | ||
|
||
private void handleRequest(ChannelHandlerContext ctx, int index, int archiveId) throws IOException | ||
{ | ||
logger.info("Client {} requests index {} archive {}", ctx.channel().remoteAddress(), index, archiveId); | ||
|
||
Index i = store.findIndex(index); | ||
assert i != null; | ||
|
||
Archive archive = i.getArchive(archiveId); | ||
assert archive != null; | ||
|
||
Storage storage = store.getStorage(); | ||
byte[] packed = storage.loadArchive(archive); // is compressed, includes length and type | ||
|
||
if (packed == null) | ||
{ | ||
logger.warn("Missing archive {}/{}", index, archiveId); | ||
return; // is it possible to notify the client of an error with this? | ||
} | ||
|
||
byte compression = packed[0]; | ||
int compressedSize = Ints.fromBytes(packed[1], packed[2], | ||
packed[3], packed[4]); | ||
|
||
// size the client expects the data to be | ||
int expectedSize = 1 // compression type | ||
+ 4 // compressed size | ||
+ compressedSize | ||
+ (compression != CompressionType.NONE ? 4 : 0); | ||
if (packed.length != expectedSize) | ||
{ | ||
// It may have the archive revision appended at the end. | ||
// The data the client writes will have it, but the data fetched from | ||
// the update server will never have it | ||
assert packed.length - expectedSize == 2 : "packed length != expected size"; | ||
packed = Arrays.copyOf(packed, packed.length - 2); | ||
} | ||
|
||
ArchiveResponsePacket response = new ArchiveResponsePacket(); | ||
response.setIndex(index); | ||
response.setArchive(archiveId); | ||
response.setData(packed); | ||
|
||
ctx.writeAndFlush(response); | ||
} | ||
|
||
private byte[] compress(int compression, byte[] data) throws IOException | ||
{ | ||
Container container = new Container(compression, -1); | ||
container.compress(data, null); | ||
return container.data; | ||
} | ||
} |
76 changes: 76 additions & 0 deletions
76
src/main/java/net/runelite/cache/server/CacheFrameDecoder.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,76 @@ | ||
/* | ||
* Copyright (c) 2016-2017, Adam <[email protected]> | ||
* 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.server; | ||
|
||
import io.netty.buffer.ByteBuf; | ||
import io.netty.channel.ChannelHandlerContext; | ||
import io.netty.handler.codec.ByteToMessageDecoder; | ||
import java.util.List; | ||
import static net.runelite.protocol.update.decoders.UpdateOpcodes.ARCHIVE_REQUEST_HIGH; | ||
import static net.runelite.protocol.update.decoders.UpdateOpcodes.ARCHIVE_REQUEST_LOW; | ||
import static net.runelite.protocol.update.decoders.UpdateOpcodes.CLIENT_LOGGED_IN; | ||
import static net.runelite.protocol.update.decoders.UpdateOpcodes.CLIENT_LOGGED_OUT; | ||
import static net.runelite.protocol.update.decoders.UpdateOpcodes.ENCRYPTION; | ||
import org.slf4j.Logger; | ||
import org.slf4j.LoggerFactory; | ||
|
||
public class CacheFrameDecoder extends ByteToMessageDecoder | ||
{ | ||
private static final Logger logger = LoggerFactory.getLogger(CacheFrameDecoder.class); | ||
|
||
@Override | ||
protected void decode(ChannelHandlerContext ctx, ByteBuf in, List<Object> out) throws Exception | ||
{ | ||
in.markReaderIndex(); | ||
byte opcode = in.readByte(); | ||
in.resetReaderIndex(); | ||
|
||
int length; | ||
|
||
switch (opcode) | ||
{ | ||
case ARCHIVE_REQUEST_LOW: | ||
case ARCHIVE_REQUEST_HIGH: | ||
case CLIENT_LOGGED_IN: | ||
case CLIENT_LOGGED_OUT: | ||
case ENCRYPTION: | ||
length = 4; | ||
break; | ||
default: | ||
logger.debug("Unknown packet opcode from {}: {}", | ||
ctx.channel().remoteAddress(), opcode); | ||
ctx.close(); | ||
return; | ||
} | ||
|
||
if (in.readableBytes() < length) | ||
{ | ||
return; | ||
} | ||
|
||
ByteBuf packet = in.readRetainedSlice(length); | ||
out.add(packet); | ||
} | ||
} |
Oops, something went wrong.