Skip to content

Display and control your Android device

Simplify messages reader/writer

Romain Vimont21b412cd9879
diff --git a/server/src/main/java/com/genymobile/scrcpy/control/ControlChannel.java b/server/src/main/java/com/genymobile/scrcpy/control/ControlChannel.java
index f24ca117..2f12cdb3 100644
--- a/server/src/main/java/com/genymobile/scrcpy/control/ControlChannel.java
+++ b/server/src/main/java/com/genymobile/scrcpy/control/ControlChannel.java
@@ -3,31 +3,22 @@ package com.genymobile.scrcpy.control;
import android.net.LocalSocket;
import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
public final class ControlChannel {
- private final InputStream inputStream;
- private final OutputStream outputStream;
- private final ControlMessageReader reader = new ControlMessageReader();
- private final DeviceMessageWriter writer = new DeviceMessageWriter();
+ private final ControlMessageReader reader;
+ private final DeviceMessageWriter writer;
public ControlChannel(LocalSocket controlSocket) throws IOException {
- this.inputStream = controlSocket.getInputStream();
- this.outputStream = controlSocket.getOutputStream();
+ reader = new ControlMessageReader(controlSocket.getInputStream());
+ writer = new DeviceMessageWriter(controlSocket.getOutputStream());
}
public ControlMessage recv() throws IOException {
- ControlMessage msg = reader.next();
- while (msg == null) {
- reader.readFrom(inputStream);
- msg = reader.next();
- }
- return msg;
+ return reader.read();
}
public void send(DeviceMessage msg) throws IOException {
- writer.writeTo(msg, outputStream);
+ writer.write(msg);
}
}
diff --git a/server/src/main/java/com/genymobile/scrcpy/control/ControlMessageReader.java b/server/src/main/java/com/genymobile/scrcpy/control/ControlMessageReader.java
index f5cfee75..f2e89da2 100644
--- a/server/src/main/java/com/genymobile/scrcpy/control/ControlMessageReader.java
+++ b/server/src/main/java/com/genymobile/scrcpy/control/ControlMessageReader.java
@@ -1,259 +1,152 @@
package com.genymobile.scrcpy.control;
import com.genymobile.scrcpy.util.Binary;
-import com.genymobile.scrcpy.util.Ln;
import com.genymobile.scrcpy.device.Position;
-import java.io.EOFException;
+import java.io.BufferedInputStream;
+import java.io.DataInputStream;
import java.io.IOException;
import java.io.InputStream;
-import java.nio.ByteBuffer;
import java.nio.charset.StandardCharsets;
public class ControlMessageReader {
- static final int INJECT_KEYCODE_PAYLOAD_LENGTH = 13;
- static final int INJECT_TOUCH_EVENT_PAYLOAD_LENGTH = 31;
- static final int INJECT_SCROLL_EVENT_PAYLOAD_LENGTH = 20;
- static final int BACK_OR_SCREEN_ON_LENGTH = 1;
- static final int SET_SCREEN_POWER_MODE_PAYLOAD_LENGTH = 1;
- static final int GET_CLIPBOARD_LENGTH = 1;
- static final int SET_CLIPBOARD_FIXED_PAYLOAD_LENGTH = 9;
- static final int UHID_CREATE_FIXED_PAYLOAD_LENGTH = 4;
- static final int UHID_INPUT_FIXED_PAYLOAD_LENGTH = 4;
-
private static final int MESSAGE_MAX_SIZE = 1 << 18; // 256k
public static final int CLIPBOARD_TEXT_MAX_LENGTH = MESSAGE_MAX_SIZE - 14; // type: 1 byte; sequence: 8 bytes; paste flag: 1 byte; length: 4 bytes
public static final int INJECT_TEXT_MAX_LENGTH = 300;
- private final byte[] rawBuffer = new byte[MESSAGE_MAX_SIZE];
- private final ByteBuffer buffer = ByteBuffer.wrap(rawBuffer);
-
- public ControlMessageReader() {
- // invariant: the buffer is always in "get" mode
- buffer.limit(0);
- }
+ private final DataInputStream dis;
- public boolean isFull() {
- return buffer.remaining() == rawBuffer.length;
- }
-
- public void readFrom(InputStream input) throws IOException {
- if (isFull()) {
- throw new IllegalStateException("Buffer full, call next() to consume");
- }
- buffer.compact();
- int head = buffer.position();
- int r = input.read(rawBuffer, head, rawBuffer.length - head);
- if (r == -1) {
- throw new EOFException("Controller socket closed");
- }
- buffer.position(head + r);
- buffer.flip();
+ public ControlMessageReader(InputStream rawInputStream) {
+ dis = new DataInputStream(new BufferedInputStream(rawInputStream));
}
- public ControlMessage next() {
- if (!buffer.hasRemaining()) {
- return null;
- }
- int savedPosition = buffer.position();
-
- int type = buffer.get();
- ControlMessage msg;
+ public ControlMessage read() throws IOException {
+ int type = dis.readUnsignedByte();
switch (type) {
case ControlMessage.TYPE_INJECT_KEYCODE:
- msg = parseInjectKeycode();
- break;
+ return parseInjectKeycode();
case ControlMessage.TYPE_INJECT_TEXT:
- msg = parseInjectText();
- break;
+ return parseInjectText();
case ControlMessage.TYPE_INJECT_TOUCH_EVENT:
- msg = parseInjectTouchEvent();
- break;
+ return parseInjectTouchEvent();
case ControlMessage.TYPE_INJECT_SCROLL_EVENT:
- msg = parseInjectScrollEvent();
- break;
+ return parseInjectScrollEvent();
case ControlMessage.TYPE_BACK_OR_SCREEN_ON:
- msg = parseBackOrScreenOnEvent();
- break;
+ return parseBackOrScreenOnEvent();
case ControlMessage.TYPE_GET_CLIPBOARD:
- msg = parseGetClipboard();
- break;
+ return parseGetClipboard();
case ControlMessage.TYPE_SET_CLIPBOARD:
- msg = parseSetClipboard();
- break;
+ return parseSetClipboard();
case ControlMessage.TYPE_SET_SCREEN_POWER_MODE:
- msg = parseSetScreenPowerMode();
- break;
+ return parseSetScreenPowerMode();
case ControlMessage.TYPE_EXPAND_NOTIFICATION_PANEL:
case ControlMessage.TYPE_EXPAND_SETTINGS_PANEL:
case ControlMessage.TYPE_COLLAPSE_PANELS:
case ControlMessage.TYPE_ROTATE_DEVICE:
case ControlMessage.TYPE_OPEN_HARD_KEYBOARD_SETTINGS:
- msg = ControlMessage.createEmpty(type);
- break;
+ return ControlMessage.createEmpty(type);
case ControlMessage.TYPE_UHID_CREATE:
- msg = parseUhidCreate();
- break;
+ return parseUhidCreate();
case ControlMessage.TYPE_UHID_INPUT:
- msg = parseUhidInput();
- break;
+ return parseUhidInput();
default:
- Ln.w("Unknown event type: " + type);
- msg = null;
- break;
- }
-
- if (msg == null) {
- // failure, reset savedPosition
- buffer.position(savedPosition);
+ throw new ControlProtocolException("Unknown event type: " + type);
}
- return msg;
}
- private ControlMessage parseInjectKeycode() {
- if (buffer.remaining() < INJECT_KEYCODE_PAYLOAD_LENGTH) {
- return null;
- }
- int action = Binary.toUnsigned(buffer.get());
- int keycode = buffer.getInt();
- int repeat = buffer.getInt();
- int metaState = buffer.getInt();
+ private ControlMessage parseInjectKeycode() throws IOException {
+ int action = dis.readUnsignedByte();
+ int keycode = dis.readInt();
+ int repeat = dis.readInt();
+ int metaState = dis.readInt();
return ControlMessage.createInjectKeycode(action, keycode, repeat, metaState);
}
- private int parseBufferLength(int sizeBytes) {
+ private int parseBufferLength(int sizeBytes) throws IOException {
assert sizeBytes > 0 && sizeBytes <= 4;
- if (buffer.remaining() < sizeBytes) {
- return -1;
- }
int value = 0;
for (int i = 0; i < sizeBytes; ++i) {
- value = (value << 8) | (buffer.get() & 0xFF);
+ value = (value << 8) | dis.readUnsignedByte();
}
return value;
}
- private String parseString() {
- int len = parseBufferLength(4);
- if (len == -1 || buffer.remaining() < len) {
- return null;
- }
- int position = buffer.position();
- // Move the buffer position to consume the text
- buffer.position(position + len);
- return new String(rawBuffer, position, len, StandardCharsets.UTF_8);
+ private String parseString() throws IOException {
+ byte[] data = parseByteArray(4);
+ return new String(data, StandardCharsets.UTF_8);
}
- private byte[] parseByteArray(int sizeBytes) {
+ private byte[] parseByteArray(int sizeBytes) throws IOException {
int len = parseBufferLength(sizeBytes);
- if (len == -1 || buffer.remaining() < len) {
- return null;
- }
byte[] data = new byte[len];
- buffer.get(data);
+ dis.readFully(data);
return data;
}
- private ControlMessage parseInjectText() {
+ private ControlMessage parseInjectText() throws IOException {
String text = parseString();
- if (text == null) {
- return null;
- }
return ControlMessage.createInjectText(text);
}
- private ControlMessage parseInjectTouchEvent() {
- if (buffer.remaining() < INJECT_TOUCH_EVENT_PAYLOAD_LENGTH) {
- return null;
- }
- int action = Binary.toUnsigned(buffer.get());
- long pointerId = buffer.getLong();
- Position position = readPosition(buffer);
- float pressure = Binary.u16FixedPointToFloat(buffer.getShort());
- int actionButton = buffer.getInt();
- int buttons = buffer.getInt();
+ private ControlMessage parseInjectTouchEvent() throws IOException {
+ int action = dis.readUnsignedByte();
+ long pointerId = dis.readLong();
+ Position position = parsePosition();
+ float pressure = Binary.u16FixedPointToFloat(dis.readShort());
+ int actionButton = dis.readInt();
+ int buttons = dis.readInt();
return ControlMessage.createInjectTouchEvent(action, pointerId, position, pressure, actionButton, buttons);
}
- private ControlMessage parseInjectScrollEvent() {
- if (buffer.remaining() < INJECT_SCROLL_EVENT_PAYLOAD_LENGTH) {
- return null;
- }
- Position position = readPosition(buffer);
- float hScroll = Binary.i16FixedPointToFloat(buffer.getShort());
- float vScroll = Binary.i16FixedPointToFloat(buffer.getShort());
- int buttons = buffer.getInt();
+ private ControlMessage parseInjectScrollEvent() throws IOException {
+ Position position = parsePosition();
+ float hScroll = Binary.i16FixedPointToFloat(dis.readShort());
+ float vScroll = Binary.i16FixedPointToFloat(dis.readShort());
+ int buttons = dis.readInt();
return ControlMessage.createInjectScrollEvent(position, hScroll, vScroll, buttons);
}
- private ControlMessage parseBackOrScreenOnEvent() {
- if (buffer.remaining() < BACK_OR_SCREEN_ON_LENGTH) {
- return null;
- }
- int action = Binary.toUnsigned(buffer.get());
+ private ControlMessage parseBackOrScreenOnEvent() throws IOException {
+ int action = dis.readUnsignedByte();
return ControlMessage.createBackOrScreenOn(action);
}
- private ControlMessage parseGetClipboard() {
- if (buffer.remaining() < GET_CLIPBOARD_LENGTH) {
- return null;
- }
- int copyKey = Binary.toUnsigned(buffer.get());
+ private ControlMessage parseGetClipboard() throws IOException {
+ int copyKey = dis.readUnsignedByte();
return ControlMessage.createGetClipboard(copyKey);
}
- private ControlMessage parseSetClipboard() {
- if (buffer.remaining() < SET_CLIPBOARD_FIXED_PAYLOAD_LENGTH) {
- return null;
- }
- long sequence = buffer.getLong();
- boolean paste = buffer.get() != 0;
+ private ControlMessage parseSetClipboard() throws IOException {
+ long sequence = dis.readLong();
+ boolean paste = dis.readByte() != 0;
String text = parseString();
- if (text == null) {
- return null;
- }
return ControlMessage.createSetClipboard(sequence, text, paste);
}
- private ControlMessage parseSetScreenPowerMode() {
- if (buffer.remaining() < SET_SCREEN_POWER_MODE_PAYLOAD_LENGTH) {
- return null;
- }
- int mode = buffer.get();
+ private ControlMessage parseSetScreenPowerMode() throws IOException {
+ int mode = dis.readUnsignedByte();
return ControlMessage.createSetScreenPowerMode(mode);
}
- private ControlMessage parseUhidCreate() {
- if (buffer.remaining() < UHID_CREATE_FIXED_PAYLOAD_LENGTH) {
- return null;
- }
- int id = buffer.getShort();
+ private ControlMessage parseUhidCreate() throws IOException {
+ int id = dis.readUnsignedShort();
byte[] data = parseByteArray(2);
- if (data == null) {
- return null;
- }
return ControlMessage.createUhidCreate(id, data);
}
- private ControlMessage parseUhidInput() {
- if (buffer.remaining() < UHID_INPUT_FIXED_PAYLOAD_LENGTH) {
- return null;
- }
- int id = buffer.getShort();
+ private ControlMessage parseUhidInput() throws IOException {
+ int id = dis.readUnsignedShort();
byte[] data = parseByteArray(2);
- if (data == null) {
- return null;
- }
return ControlMessage.createUhidInput(id, data);
}
- private static Position readPosition(ByteBuffer buffer) {
- int x = buffer.getInt();
- int y = buffer.getInt();
- int screenWidth = Binary.toUnsigned(buffer.getShort());
- int screenHeight = Binary.toUnsigned(buffer.getShort());
+ private Position parsePosition() throws IOException {
+ int x = dis.readInt();
+ int y = dis.readInt();
+ int screenWidth = dis.readUnsignedShort();
+ int screenHeight = dis.readUnsignedShort();
return new Position(x, y, screenWidth, screenHeight);
}
}
diff --git a/server/src/main/java/com/genymobile/scrcpy/control/ControlProtocolException.java b/server/src/main/java/com/genymobile/scrcpy/control/ControlProtocolException.java
new file mode 100644
index 00000000..cabf63ee
--- /dev/null
+++ b/server/src/main/java/com/genymobile/scrcpy/control/ControlProtocolException.java
@@ -0,0 +1,9 @@
+package com.genymobile.scrcpy.control;
+
+import java.io.IOException;
+
+public class ControlProtocolException extends IOException {
+ public ControlProtocolException(String message) {
+ super(message);
+ }
+}
diff --git a/server/src/main/java/com/genymobile/scrcpy/control/DeviceMessageWriter.java b/server/src/main/java/com/genymobile/scrcpy/control/DeviceMessageWriter.java
index 6bf53bed..a18a2e5d 100644
--- a/server/src/main/java/com/genymobile/scrcpy/control/DeviceMessageWriter.java
+++ b/server/src/main/java/com/genymobile/scrcpy/control/DeviceMessageWriter.java
@@ -1,11 +1,11 @@
package com.genymobile.scrcpy.control;
-import com.genymobile.scrcpy.util.Ln;
import com.genymobile.scrcpy.util.StringUtils;
+import java.io.BufferedOutputStream;
+import java.io.DataOutputStream;
import java.io.IOException;
import java.io.OutputStream;
-import java.nio.ByteBuffer;
import java.nio.charset.StandardCharsets;
public class DeviceMessageWriter {
@@ -13,35 +13,35 @@ public class DeviceMessageWriter {
private static final int MESSAGE_MAX_SIZE = 1 << 18; // 256k
public static final int CLIPBOARD_TEXT_MAX_LENGTH = MESSAGE_MAX_SIZE - 5; // type: 1 byte; length: 4 bytes
- private final byte[] rawBuffer = new byte[MESSAGE_MAX_SIZE];
- private final ByteBuffer buffer = ByteBuffer.wrap(rawBuffer);
+ private final DataOutputStream dos;
- public void writeTo(DeviceMessage msg, OutputStream output) throws IOException {
- buffer.clear();
- buffer.put((byte) msg.getType());
- switch (msg.getType()) {
+ public DeviceMessageWriter(OutputStream rawOutputStream) {
+ dos = new DataOutputStream(new BufferedOutputStream(rawOutputStream));
+ }
+
+ public void write(DeviceMessage msg) throws IOException {
+ int type = msg.getType();
+ dos.writeByte(type);
+ switch (type) {
case DeviceMessage.TYPE_CLIPBOARD:
String text = msg.getText();
byte[] raw = text.getBytes(StandardCharsets.UTF_8);
int len = StringUtils.getUtf8TruncationIndex(raw, CLIPBOARD_TEXT_MAX_LENGTH);
- buffer.putInt(len);
- buffer.put(raw, 0, len);
- output.write(rawBuffer, 0, buffer.position());
+ dos.writeInt(len);
+ dos.write(raw, 0, len);
break;
case DeviceMessage.TYPE_ACK_CLIPBOARD:
- buffer.putLong(msg.getSequence());
- output.write(rawBuffer, 0, buffer.position());
+ dos.writeLong(msg.getSequence());
break;
case DeviceMessage.TYPE_UHID_OUTPUT:
- buffer.putShort((short) msg.getId());
+ dos.writeShort(msg.getId());
byte[] data = msg.getData();
- buffer.putShort((short) data.length);
- buffer.put(data);
- output.write(rawBuffer, 0, buffer.position());
+ dos.writeShort(data.length);
+ dos.write(data);
break;
default:
- Ln.w("Unknown device message: " + msg.getType());
- break;
+ throw new ControlProtocolException("Unknown event type: " + type);
}
+ dos.flush();
}
}
diff --git a/server/src/test/java/com/genymobile/scrcpy/control/ControlMessageReaderTest.java b/server/src/test/java/com/genymobile/scrcpy/control/ControlMessageReaderTest.java
index 1737730f..ae18154d 100644
--- a/server/src/test/java/com/genymobile/scrcpy/control/ControlMessageReaderTest.java
+++ b/server/src/test/java/com/genymobile/scrcpy/control/ControlMessageReaderTest.java
@@ -10,6 +10,7 @@ import org.junit.Test;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.DataOutputStream;
+import java.io.EOFException;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.util.Arrays;
@@ -18,8 +19,6 @@ public class ControlMessageReaderTest {
@Test
public void testParseKeycodeEvent() throws IOException {
- ControlMessageReader reader = new ControlMessageReader();
-
ByteArrayOutputStream bos = new ByteArrayOutputStream();
DataOutputStream dos = new DataOutputStream(bos);
dos.writeByte(ControlMessage.TYPE_INJECT_KEYCODE);
@@ -29,23 +28,21 @@ public class ControlMessageReaderTest {
dos.writeInt(KeyEvent.META_CTRL_ON);
byte[] packet = bos.toByteArray();
- // The message type (1 byte) does not count
- Assert.assertEquals(ControlMessageReader.INJECT_KEYCODE_PAYLOAD_LENGTH, packet.length - 1);
-
- reader.readFrom(new ByteArrayInputStream(packet));
- ControlMessage event = reader.next();
+ ByteArrayInputStream bis = new ByteArrayInputStream(packet);
+ ControlMessageReader reader = new ControlMessageReader(bis);
+ ControlMessage event = reader.read();
Assert.assertEquals(ControlMessage.TYPE_INJECT_KEYCODE, event.getType());
Assert.assertEquals(KeyEvent.ACTION_UP, event.getAction());
Assert.assertEquals(KeyEvent.KEYCODE_ENTER, event.getKeycode());
Assert.assertEquals(5, event.getRepeat());
Assert.assertEquals(KeyEvent.META_CTRL_ON, event.getMetaState());
+
+ Assert.assertEquals(-1, bis.read()); // EOS
}
@Test
public void testParseTextEvent() throws IOException {
- ControlMessageReader reader = new ControlMessageReader();
-
ByteArrayOutputStream bos = new ByteArrayOutputStream();
DataOutputStream dos = new DataOutputStream(bos);
dos.writeByte(ControlMessage.TYPE_INJECT_TEXT);
@@ -54,17 +51,18 @@ public class ControlMessageReaderTest {
dos.write(text);
byte[] packet = bos.toByteArray();
- reader.readFrom(new ByteArrayInputStream(packet));
- ControlMessage event = reader.next();
+ ByteArrayInputStream bis = new ByteArrayInputStream(packet);
+ ControlMessageReader reader = new ControlMessageReader(bis);
+ ControlMessage event = reader.read();
Assert.assertEquals(ControlMessage.TYPE_INJECT_TEXT, event.getType());
Assert.assertEquals("testé", event.getText());
+
+ Assert.assertEquals(-1, bis.read()); // EOS
}
@Test
public void testParseLongTextEvent() throws IOException {
- ControlMessageReader reader = new ControlMessageReader();
-
ByteArrayOutputStream bos = new ByteArrayOutputStream();
DataOutputStream dos = new DataOutputStream(bos);
dos.writeByte(ControlMessage.TYPE_INJECT_TEXT);
@@ -74,17 +72,18 @@ public class ControlMessageReaderTest {
dos.write(text);
byte[] packet = bos.toByteArray();
- reader.readFrom(new ByteArrayInputStream(packet));
- ControlMessage event = reader.next();
+ ByteArrayInputStream bis = new ByteArrayInputStream(packet);
+ ControlMessageReader reader = new ControlMessageReader(bis);
+ ControlMessage event = reader.read();
Assert.assertEquals(ControlMessage.TYPE_INJECT_TEXT, event.getType());
Assert.assertEquals(new String(text, StandardCharsets.US_ASCII), event.getText());
+
+ Assert.assertEquals(-1, bis.read()); // EOS
}
@Test
public void testParseTouchEvent() throws IOException {
- ControlMessageReader reader = new ControlMessageReader();
-
ByteArrayOutputStream bos = new ByteArrayOutputStream();
DataOutputStream dos = new DataOutputStream(bos);
dos.writeByte(ControlMessage.TYPE_INJECT_TOUCH_EVENT);
@@ -100,12 +99,10 @@ public class ControlMessageReaderTest {
byte[] packet = bos.toByteArray();
- // The message type (1 byte) does not count
- Assert.assertEquals(ControlMessageReader.INJECT_TOUCH_EVENT_PAYLOAD_LENGTH, packet.length - 1);
-
- reader.readFrom(new ByteArrayInputStream(packet));
- ControlMessage event = reader.next();
+ ByteArrayInputStream bis = new ByteArrayInputStream(packet);
+ ControlMessageReader reader = new ControlMessageReader(bis);
+ ControlMessage event = reader.read();
Assert.assertEquals(ControlMessage.TYPE_INJECT_TOUCH_EVENT, event.getType());
Assert.assertEquals(MotionEvent.ACTION_DOWN, event.getAction());
Assert.assertEquals(-42, event.getPointerId());
@@ -116,12 +113,12 @@ public class ControlMessageReaderTest {
Assert.assertEquals(1f, event.getPressure(), 0f); // must be exact
Assert.assertEquals(MotionEvent.BUTTON_PRIMARY, event.getActionButton());
Assert.assertEquals(MotionEvent.BUTTON_PRIMARY, event.getButtons());
+
+ Assert.assertEquals(-1, bis.read()); // EOS
}
@Test
public void testParseScrollEvent() throws IOException {
- ControlMessageReader reader = new ControlMessageReader();
-
ByteArrayOutputStream bos = new ByteArrayOutputStream();
DataOutputStream dos = new DataOutputStream(bos);
dos.writeByte(ControlMessage.TYPE_INJECT_SCROLL_EVENT);
@@ -132,15 +129,12 @@ public class ControlMessageReaderTest {
dos.writeShort(0); // 0.0f encoded as i16
dos.writeShort(0x8000); // -1.0f encoded as i16
dos.writeInt(1);
-
byte[] packet = bos.toByteArray();
- // The message type (1 byte) does not count
- Assert.assertEquals(ControlMessageReader.INJECT_SCROLL_EVENT_PAYLOAD_LENGTH, packet.length - 1);
-
- reader.readFrom(new ByteArrayInputStream(packet));
- ControlMessage event = reader.next();
+ ByteArrayInputStream bis = new ByteArrayInputStream(packet);
+ ControlMessageReader reader = new ControlMessageReader(bis);
+ ControlMessage event = reader.read();
Assert.assertEquals(ControlMessage.TYPE_INJECT_SCROLL_EVENT, event.getType());
Assert.assertEquals(260, event.getPosition().getPoint().getX());
Assert.assertEquals(1026, event.getPosition().getPoint().getY());
@@ -149,96 +143,96 @@ public class ControlMessageReaderTest {
Assert.assertEquals(0f, event.getHScroll(), 0f);
Assert.assertEquals(-1f, event.getVScroll(), 0f);
Assert.assertEquals(1, event.getButtons());
+
+ Assert.assertEquals(-1, bis.read()); // EOS
}
@Test
public void testParseBackOrScreenOnEvent() throws IOException {
- ControlMessageReader reader = new ControlMessageReader();
-
ByteArrayOutputStream bos = new ByteArrayOutputStream();
DataOutputStream dos = new DataOutputStream(bos);
dos.writeByte(ControlMessage.TYPE_BACK_OR_SCREEN_ON);
dos.writeByte(KeyEvent.ACTION_UP);
-
byte[] packet = bos.toByteArray();
- reader.readFrom(new ByteArrayInputStream(packet));
- ControlMessage event = reader.next();
+ ByteArrayInputStream bis = new ByteArrayInputStream(packet);
+ ControlMessageReader reader = new ControlMessageReader(bis);
+ ControlMessage event = reader.read();
Assert.assertEquals(ControlMessage.TYPE_BACK_OR_SCREEN_ON, event.getType());
Assert.assertEquals(KeyEvent.ACTION_UP, event.getAction());
+
+ Assert.assertEquals(-1, bis.read()); // EOS
}
@Test
public void testParseExpandNotificationPanelEvent() throws IOException {
- ControlMessageReader reader = new ControlMessageReader();
-
ByteArrayOutputStream bos = new ByteArrayOutputStream();
DataOutputStream dos = new DataOutputStream(bos);
dos.writeByte(ControlMessage.TYPE_EXPAND_NOTIFICATION_PANEL);
-
byte[] packet = bos.toByteArray();
- reader.readFrom(new ByteArrayInputStream(packet));
- ControlMessage event = reader.next();
+ ByteArrayInputStream bis = new ByteArrayInputStream(packet);
+ ControlMessageReader reader = new ControlMessageReader(bis);
+ ControlMessage event = reader.read();
Assert.assertEquals(ControlMessage.TYPE_EXPAND_NOTIFICATION_PANEL, event.getType());
+
+ Assert.assertEquals(-1, bis.read()); // EOS
}
@Test
public void testParseExpandSettingsPanelEvent() throws IOException {
- ControlMessageReader reader = new ControlMessageReader();
-
ByteArrayOutputStream bos = new ByteArrayOutputStream();
DataOutputStream dos = new DataOutputStream(bos);
dos.writeByte(ControlMessage.TYPE_EXPAND_SETTINGS_PANEL);
-
byte[] packet = bos.toByteArray();
- reader.readFrom(new ByteArrayInputStream(packet));
- ControlMessage event = reader.next();
+ ByteArrayInputStream bis = new ByteArrayInputStream(packet);
+ ControlMessageReader reader = new ControlMessageReader(bis);
+ ControlMessage event = reader.read();
Assert.assertEquals(ControlMessage.TYPE_EXPAND_SETTINGS_PANEL, event.getType());
+
+ Assert.assertEquals(-1, bis.read()); // EOS
}
@Test
public void testParseCollapsePanelsEvent() throws IOException {
- ControlMessageReader reader = new ControlMessageReader();
-
ByteArrayOutputStream bos = new ByteArrayOutputStream();
DataOutputStream dos = new DataOutputStream(bos);
dos.writeByte(ControlMessage.TYPE_COLLAPSE_PANELS);
-
byte[] packet = bos.toByteArray();
- reader.readFrom(new ByteArrayInputStream(packet));
- ControlMessage event = reader.next();
+ ByteArrayInputStream bis = new ByteArrayInputStream(packet);
+ ControlMessageReader reader = new ControlMessageReader(bis);
+ ControlMessage event = reader.read();
Assert.assertEquals(ControlMessage.TYPE_COLLAPSE_PANELS, event.getType());
+
+ Assert.assertEquals(-1, bis.read()); // EOS
}
@Test
public void testParseGetClipboardEvent() throws IOException {
- ControlMessageReader reader = new ControlMessageReader();
-
ByteArrayOutputStream bos = new ByteArrayOutputStream();
DataOutputStream dos = new DataOutputStream(bos);
dos.writeByte(ControlMessage.TYPE_GET_CLIPBOARD);
dos.writeByte(ControlMessage.COPY_KEY_COPY);
-
byte[] packet = bos.toByteArray();
- reader.readFrom(new ByteArrayInputStream(packet));
- ControlMessage event = reader.next();
+ ByteArrayInputStream bis = new ByteArrayInputStream(packet);
+ ControlMessageReader reader = new ControlMessageReader(bis);
+ ControlMessage event = reader.read();
Assert.assertEquals(ControlMessage.TYPE_GET_CLIPBOARD, event.getType());
Assert.assertEquals(ControlMessage.COPY_KEY_COPY, event.getCopyKey());
+
+ Assert.assertEquals(-1, bis.read()); // EOS
}
@Test
public void testParseSetClipboardEvent() throws IOException {
- ControlMessageReader reader = new ControlMessageReader();
-
ByteArrayOutputStream bos = new ByteArrayOutputStream();
DataOutputStream dos = new DataOutputStream(bos);
dos.writeByte(ControlMessage.TYPE_SET_CLIPBOARD);
@@ -247,22 +241,22 @@ public class ControlMessageReaderTest {
byte[] text = "testé".getBytes(StandardCharsets.UTF_8);
dos.writeInt(text.length);
dos.write(text);
-
byte[] packet = bos.toByteArray();
- reader.readFrom(new ByteArrayInputStream(packet));
- ControlMessage event = reader.next();
+ ByteArrayInputStream bis = new ByteArrayInputStream(packet);
+ ControlMessageReader reader = new ControlMessageReader(bis);
+ ControlMessage event = reader.read();
Assert.assertEquals(ControlMessage.TYPE_SET_CLIPBOARD, event.getType());
Assert.assertEquals(0x0102030405060708L, event.getSequence());
Assert.assertEquals("testé", event.getText());
Assert.assertTrue(event.getPaste());
+
+ Assert.assertEquals(-1, bis.read()); // EOS
}
@Test
public void testParseBigSetClipboardEvent() throws IOException {
- ControlMessageReader reader = new ControlMessageReader();
-
ByteArrayOutputStream bos = new ByteArrayOutputStream();
DataOutputStream dos = new DataOutputStream(bos);
dos.writeByte(ControlMessage.TYPE_SET_CLIPBOARD);
@@ -278,56 +272,54 @@ public class ControlMessageReaderTest {
byte[] packet = bos.toByteArray();
- reader.readFrom(new ByteArrayInputStream(packet));
- ControlMessage event = reader.next();
+ ByteArrayInputStream bis = new ByteArrayInputStream(packet);
+ ControlMessageReader reader = new ControlMessageReader(bis);
+ ControlMessage event = reader.read();
Assert.assertEquals(ControlMessage.TYPE_SET_CLIPBOARD, event.getType());
Assert.assertEquals(0x0807060504030201L, event.getSequence());
Assert.assertEquals(text, event.getText());
Assert.assertTrue(event.getPaste());
+
+ Assert.assertEquals(-1, bis.read()); // EOS
}
@Test
public void testParseSetScreenPowerMode() throws IOException {
- ControlMessageReader reader = new ControlMessageReader();
-
ByteArrayOutputStream bos = new ByteArrayOutputStream();
DataOutputStream dos = new DataOutputStream(bos);
dos.writeByte(ControlMessage.TYPE_SET_SCREEN_POWER_MODE);
dos.writeByte(Device.POWER_MODE_NORMAL);
-
byte[] packet = bos.toByteArray();
- // The message type (1 byte) does not count
- Assert.assertEquals(ControlMessageReader.SET_SCREEN_POWER_MODE_PAYLOAD_LENGTH, packet.length - 1);
-
- reader.readFrom(new ByteArrayInputStream(packet));
- ControlMessage event = reader.next();
+ ByteArrayInputStream bis = new ByteArrayInputStream(packet);
+ ControlMessageReader reader = new ControlMessageReader(bis);
+ ControlMessage event = reader.read();
Assert.assertEquals(ControlMessage.TYPE_SET_SCREEN_POWER_MODE, event.getType());
Assert.assertEquals(Device.POWER_MODE_NORMAL, event.getAction());
+
+ Assert.assertEquals(-1, bis.read()); // EOS
}
@Test
public void testParseRotateDevice() throws IOException {
- ControlMessageReader reader = new ControlMessageReader();
-
ByteArrayOutputStream bos = new ByteArrayOutputStream();
DataOutputStream dos = new DataOutputStream(bos);
dos.writeByte(ControlMessage.TYPE_ROTATE_DEVICE);
-
byte[] packet = bos.toByteArray();
- reader.readFrom(new ByteArrayInputStream(packet));
- ControlMessage event = reader.next();
+ ByteArrayInputStream bis = new ByteArrayInputStream(packet);
+ ControlMessageReader reader = new ControlMessageReader(bis);
+ ControlMessage event = reader.read();
Assert.assertEquals(ControlMessage.TYPE_ROTATE_DEVICE, event.getType());
+
+ Assert.assertEquals(-1, bis.read()); // EOS
}
@Test
public void testParseUhidCreate() throws IOException {
- ControlMessageReader reader = new ControlMessageReader();
-
ByteArrayOutputStream bos = new ByteArrayOutputStream();
DataOutputStream dos = new DataOutputStream(bos);
dos.writeByte(ControlMessage.TYPE_UHID_CREATE);
@@ -335,21 +327,21 @@ public class ControlMessageReaderTest {
byte[] data = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11};
dos.writeShort(data.length); // size
dos.write(data);
-
byte[] packet = bos.toByteArray();
- reader.readFrom(new ByteArrayInputStream(packet));
- ControlMessage event = reader.next();
+ ByteArrayInputStream bis = new ByteArrayInputStream(packet);
+ ControlMessageReader reader = new ControlMessageReader(bis);
+ ControlMessage event = reader.read();
Assert.assertEquals(ControlMessage.TYPE_UHID_CREATE, event.getType());
Assert.assertEquals(42, event.getId());
Assert.assertArrayEquals(data, event.getData());
+
+ Assert.assertEquals(-1, bis.read()); // EOS
}
@Test
public void testParseUhidInput() throws IOException {
- ControlMessageReader reader = new ControlMessageReader();
-
ByteArrayOutputStream bos = new ByteArrayOutputStream();
DataOutputStream dos = new DataOutputStream(bos);
dos.writeByte(ControlMessage.TYPE_UHID_INPUT);
@@ -357,37 +349,37 @@ public class ControlMessageReaderTest {
byte[] data = {1, 2, 3, 4, 5};
dos.writeShort(data.length); // size
dos.write(data);
-
byte[] packet = bos.toByteArray();
- reader.readFrom(new ByteArrayInputStream(packet));
- ControlMessage event = reader.next();
+ ByteArrayInputStream bis = new ByteArrayInputStream(packet);
+ ControlMessageReader reader = new ControlMessageReader(bis);
+ ControlMessage event = reader.read();
Assert.assertEquals(ControlMessage.TYPE_UHID_INPUT, event.getType());
Assert.assertEquals(42, event.getId());
Assert.assertArrayEquals(data, event.getData());
+
+ Assert.assertEquals(-1, bis.read()); // EOS
}
@Test
public void testParseOpenHardKeyboardSettings() throws IOException {
- ControlMessageReader reader = new ControlMessageReader();
-
ByteArrayOutputStream bos = new ByteArrayOutputStream();
DataOutputStream dos = new DataOutputStream(bos);
dos.writeByte(ControlMessage.TYPE_OPEN_HARD_KEYBOARD_SETTINGS);
-
byte[] packet = bos.toByteArray();
- reader.readFrom(new ByteArrayInputStream(packet));
- ControlMessage event = reader.next();
+ ByteArrayInputStream bis = new ByteArrayInputStream(packet);
+ ControlMessageReader reader = new ControlMessageReader(bis);
+ ControlMessage event = reader.read();
Assert.assertEquals(ControlMessage.TYPE_OPEN_HARD_KEYBOARD_SETTINGS, event.getType());
+
+ Assert.assertEquals(-1, bis.read()); // EOS
}
@Test
public void testMultiEvents() throws IOException {
- ControlMessageReader reader = new ControlMessageReader();
-
ByteArrayOutputStream bos = new ByteArrayOutputStream();
DataOutputStream dos = new DataOutputStream(bos);
@@ -404,27 +396,29 @@ public class ControlMessageReaderTest {
dos.writeInt(KeyEvent.META_CTRL_ON);
byte[] packet = bos.toByteArray();
- reader.readFrom(new ByteArrayInputStream(packet));
- ControlMessage event = reader.next();
+ ByteArrayInputStream bis = new ByteArrayInputStream(packet);
+ ControlMessageReader reader = new ControlMessageReader(bis);
+
+ ControlMessage event = reader.read();
Assert.assertEquals(ControlMessage.TYPE_INJECT_KEYCODE, event.getType());
Assert.assertEquals(KeyEvent.ACTION_UP, event.getAction());
Assert.assertEquals(KeyEvent.KEYCODE_ENTER, event.getKeycode());
Assert.assertEquals(0, event.getRepeat());
Assert.assertEquals(KeyEvent.META_CTRL_ON, event.getMetaState());
- event = reader.next();
+ event = reader.read();
Assert.assertEquals(ControlMessage.TYPE_INJECT_KEYCODE, event.getType());
Assert.assertEquals(MotionEvent.ACTION_DOWN, event.getAction());
Assert.assertEquals(MotionEvent.BUTTON_PRIMARY, event.getKeycode());
Assert.assertEquals(1, event.getRepeat());
Assert.assertEquals(KeyEvent.META_CTRL_ON, event.getMetaState());
+
+ Assert.assertEquals(-1, bis.read()); // EOS
}
@Test
public void testPartialEvents() throws IOException {
- ControlMessageReader reader = new ControlMessageReader();
-
ByteArrayOutputStream bos = new ByteArrayOutputStream();
DataOutputStream dos = new DataOutputStream(bos);
@@ -438,31 +432,21 @@ public class ControlMessageReaderTest {
dos.writeByte(MotionEvent.ACTION_DOWN);
byte[] packet = bos.toByteArray();
- reader.readFrom(new ByteArrayInputStream(packet));
+ ByteArrayInputStream bis = new ByteArrayInputStream(packet);
+ ControlMessageReader reader = new ControlMessageReader(bis);
- ControlMessage event = reader.next();
+ ControlMessage event = reader.read();
Assert.assertEquals(ControlMessage.TYPE_INJECT_KEYCODE, event.getType());
Assert.assertEquals(KeyEvent.ACTION_UP, event.getAction());
Assert.assertEquals(KeyEvent.KEYCODE_ENTER, event.getKeycode());
Assert.assertEquals(4, event.getRepeat());
Assert.assertEquals(KeyEvent.META_CTRL_ON, event.getMetaState());
- event = reader.next();
- Assert.assertNull(event); // the event is not complete
-
- bos.reset();
- dos.writeInt(MotionEvent.BUTTON_PRIMARY);
- dos.writeInt(5); // repeat
- dos.writeInt(KeyEvent.META_CTRL_ON);
- packet = bos.toByteArray();
- reader.readFrom(new ByteArrayInputStream(packet));
-
- // the event is now complete
- event = reader.next();
- Assert.assertEquals(ControlMessage.TYPE_INJECT_KEYCODE, event.getType());
- Assert.assertEquals(MotionEvent.ACTION_DOWN, event.getAction());
- Assert.assertEquals(MotionEvent.BUTTON_PRIMARY, event.getKeycode());
- Assert.assertEquals(5, event.getRepeat());
- Assert.assertEquals(KeyEvent.META_CTRL_ON, event.getMetaState());
+ try {
+ event = reader.read();
+ Assert.fail("Reader did not reach EOF");
+ } catch (EOFException e) {
+ // expected
+ }
}
}
diff --git a/server/src/test/java/com/genymobile/scrcpy/control/DeviceMessageWriterTest.java b/server/src/test/java/com/genymobile/scrcpy/control/DeviceMessageWriterTest.java
index ff1a2fbc..4e4717fd 100644
--- a/server/src/test/java/com/genymobile/scrcpy/control/DeviceMessageWriterTest.java
+++ b/server/src/test/java/com/genymobile/scrcpy/control/DeviceMessageWriterTest.java
@@ -12,8 +12,6 @@ public class DeviceMessageWriterTest {
@Test
public void testSerializeClipboard() throws IOException {
- DeviceMessageWriter writer = new DeviceMessageWriter();
-
String text = "aéûoç";
byte[] data = text.getBytes(StandardCharsets.UTF_8);
ByteArrayOutputStream bos = new ByteArrayOutputStream();
@@ -21,12 +19,13 @@ public class DeviceMessageWriterTest {
dos.writeByte(DeviceMessage.TYPE_CLIPBOARD);
dos.writeInt(data.length);
dos.write(data);
-
byte[] expected = bos.toByteArray();
- DeviceMessage msg = DeviceMessage.createClipboard(text);
bos = new ByteArrayOutputStream();
- writer.writeTo(msg, bos);
+ DeviceMessageWriter writer = new DeviceMessageWriter(bos);
+
+ DeviceMessage msg = DeviceMessage.createClipboard(text);
+ writer.write(msg);
byte[] actual = bos.toByteArray();
@@ -35,18 +34,17 @@ public class DeviceMessageWriterTest {
@Test
public void testSerializeAckSetClipboard() throws IOException {
- DeviceMessageWriter writer = new DeviceMessageWriter();
-
ByteArrayOutputStream bos = new ByteArrayOutputStream();
DataOutputStream dos = new DataOutputStream(bos);
dos.writeByte(DeviceMessage.TYPE_ACK_CLIPBOARD);
dos.writeLong(0x0102030405060708L);
-
byte[] expected = bos.toByteArray();
- DeviceMessage msg = DeviceMessage.createAckClipboard(0x0102030405060708L);
bos = new ByteArrayOutputStream();
- writer.writeTo(msg, bos);
+ DeviceMessageWriter writer = new DeviceMessageWriter(bos);
+
+ DeviceMessage msg = DeviceMessage.createAckClipboard(0x0102030405060708L);
+ writer.write(msg);
byte[] actual = bos.toByteArray();
@@ -55,8 +53,6 @@ public class DeviceMessageWriterTest {
@Test
public void testSerializeUhidOutput() throws IOException {
- DeviceMessageWriter writer = new DeviceMessageWriter();
-
ByteArrayOutputStream bos = new ByteArrayOutputStream();
DataOutputStream dos = new DataOutputStream(bos);
dos.writeByte(DeviceMessage.TYPE_UHID_OUTPUT);
@@ -64,12 +60,13 @@ public class DeviceMessageWriterTest {
byte[] data = {1, 2, 3, 4, 5};
dos.writeShort(data.length);
dos.write(data);
-
byte[] expected = bos.toByteArray();
- DeviceMessage msg = DeviceMessage.createUhidOutput(42, data);
bos = new ByteArrayOutputStream();
- writer.writeTo(msg, bos);
+ DeviceMessageWriter writer = new DeviceMessageWriter(bos);
+
+ DeviceMessage msg = DeviceMessage.createUhidOutput(42, data);
+ writer.write(msg);
byte[] actual = bos.toByteArray();